Skip to content

fix: eliminate data races in Debugger and ServiceKey #977

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.

Sign up for GitHub

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

Merged
holyfuchs merged 2 commits into from
Mar 27, 2026
Merged

fix: eliminate data races in Debugger and ServiceKey #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56ab0c5
fix: eagerly initialize public key in ServiceKey fixing data race
holyfuchs Mar 20, 2026
610af86
fix: protect Debugger.listener with mutex
holyfuchs Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions emulator/emulator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ func GenerateDefaultServiceKey(

return ServiceKey{
PrivateKey: privateKey,
PublicKey: privateKey.PublicKey(),
SigAlgo: sigAlgo,
HashAlgo: hashAlgo,
}
Expand All @@ -75,19 +76,9 @@ func (s ServiceKey) Signer() (sdkcrypto.Signer, error) {
}

func (s ServiceKey) AccountKey() *flowsdk.AccountKey {

var publicKey sdkcrypto.PublicKey
if s.PublicKey != nil {
publicKey = s.PublicKey
}

if s.PrivateKey != nil {
publicKey = s.PrivateKey.PublicKey()
}

return &flowsdk.AccountKey{
Index: s.Index,
PublicKey: publicKey,
PublicKey: s.PublicKey,
SigAlgo: s.SigAlgo,
HashAlgo: s.HashAlgo,
Weight: s.Weight,
Expand Down
18 changes: 16 additions & 2 deletions server/debugger/debugger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ type Debugger struct {
logger *zerolog.Logger
emulator emulator.Emulator
port int
mu sync.Mutex // protects listener and stopped
listener net.Listener
stopped bool
quit chan interface{}
wg sync.WaitGroup
stopOnce sync.Once
Expand All @@ -58,7 +60,15 @@ func (d *Debugger) Start() (err error) {
if err != nil {
return err
}
d.mu.Lock()
d.listener = listener
alreadyStopped := d.stopped
d.mu.Unlock()

if alreadyStopped {
return listener.Close()
}

defer func() {
err = listener.Close()
}()
Expand Down Expand Up @@ -127,8 +137,12 @@ func (d *Debugger) handleConnection(conn net.Conn) {
func (d *Debugger) Stop() {
d.stopOnce.Do(func() {
close(d.quit)
if d.listener != nil {
_ = d.listener.Close()
d.mu.Lock()
l := d.listener
d.stopped = true
d.mu.Unlock()
if l != nil {
_ = l.Close()
}
for _, conn := range d.connections {
_ = conn.Close()
Expand Down
Loading