kvazar/keva-stratum
1
0
Fork 0
mirror of https://github.com/kvazar-network/keva-stratum.git synced 2025-01-27 15:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Handle job not ready

Browse Source
This commit is contained in:
Sammy Libre 2016-12-06 23:03:54 +05:00
parent eed80cf00d
commit bea4312446
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
go-pool/stratum/handlers.go
View File

@ -21,6 +21,12 @@ func (s *StratumServer) handleLoginRPC(cs *Session, e *Endpoint, params *LoginPa
return return
} }
t := s.currentBlockTemplate()
if t == nil {
errorReply = &ErrorReply{Code: -1, Message: "Job not ready", Close: true}
return
}
miner := NewMiner(params.Login, params.Pass, e.config.Difficulty, cs.ip) miner := NewMiner(params.Login, params.Pass, e.config.Difficulty, cs.ip)
miner.Session = cs miner.Session = cs
miner.Endpoint = e miner.Endpoint = e
@ -31,7 +37,7 @@ func (s *StratumServer) handleLoginRPC(cs *Session, e *Endpoint, params *LoginPa
reply = &JobReply{} reply = &JobReply{}
reply.Id = miner.Id reply.Id = miner.Id
reply.Job = miner.getJob(s) reply.Job = miner.getJob(t)
reply.Status = "OK" reply.Status = "OK"
return return
} }
@ -42,8 +48,13 @@ func (s *StratumServer) handleGetJobRPC(cs *Session, e *Endpoint, params *GetJob
errorReply = &ErrorReply{Code: -1, Message: "Unauthenticated", Close: true} errorReply = &ErrorReply{Code: -1, Message: "Unauthenticated", Close: true}
return return
} }
t := s.currentBlockTemplate()
if t == nil {
errorReply = &ErrorReply{Code: -1, Message: "Job not ready", Close: true}
return
}
miner.heartbeat() miner.heartbeat()
reply = miner.getJob(s) reply = miner.getJob(t)
return return
} }
@ -99,6 +110,10 @@ func (s *StratumServer) handleUnknownRPC(cs *Session, req *JSONRpcReq) *ErrorRep
} }
func (s *StratumServer) broadcastNewJobs() { func (s *StratumServer) broadcastNewJobs() {
t := s.currentBlockTemplate()
if t == nil {
return
}
log.Printf("Broadcasting new jobs to %v miners", s.miners.Count()) log.Printf("Broadcasting new jobs to %v miners", s.miners.Count())
bcast := make(chan int, 1024*16) bcast := make(chan int, 1024*16)
n := 0 n := 0
@ -107,7 +122,7 @@ func (s *StratumServer) broadcastNewJobs() {
n++ n++
bcast <- n bcast <- n
go func(miner *Miner) { go func(miner *Miner) {
reply := miner.getJob(s) reply := miner.getJob(t)
err := miner.Session.pushMessage("job", &reply) err := miner.Session.pushMessage("job", &reply)
<-bcast <-bcast
if err != nil { if err != nil {

3
go-pool/stratum/miner.go
View File

@ -78,8 +78,7 @@ func (m *Miner) pushJob(job *Job) {
} }
} }
func (m *Miner) getJob(s *StratumServer) *JobReplyData { func (m *Miner) getJob(t *BlockTemplate) *JobReplyData {
t := s.currentBlockTemplate()
height := atomic.SwapInt64(&m.LastBlockHeight, t.Height) height := atomic.SwapInt64(&m.LastBlockHeight, t.Height)
if height == t.Height { if height == t.Height {