Skip to content

Commit e933fab

Browse files
committed
fixed minor bug wrt locks
1 parent 90d1bd3 commit e933fab

File tree

1 file changed

+32
-10
lines changed

1 file changed

+32
-10
lines changed

pokt/executor.go

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ func (x *BurnExecutorRunner) HandleInvalidMint(doc models.InvalidMint) bool {
6060
res, err := x.client.SubmitRawTx(p)
6161
if err != nil {
6262
log.Error("[BURN EXECUTOR] Error submitting transaction: ", err)
63+
if lockId != "" && doc.Status == models.StatusSigned {
64+
err = app.DB.Unlock(lockId)
65+
if err != nil {
66+
log.Error("[BURN EXECUTOR] Error unlocking invalid mint: ", err)
67+
} else {
68+
log.Debug("[BURN EXECUTOR] Unlocked invalid mint: ", doc.TransactionHash)
69+
}
70+
}
6371
return false
6472
}
6573

@@ -111,23 +119,26 @@ func (x *BurnExecutorRunner) HandleInvalidMint(doc models.InvalidMint) bool {
111119
}
112120

113121
err := app.DB.UpdateOne(models.CollectionInvalidMints, filter, update)
122+
success := err == nil
114123
if err != nil {
115124
log.Error("[BURN EXECUTOR] Error updating invalid mint: ", err)
116-
return false
117125
}
118126

119127
if lockId != "" && doc.Status == models.StatusSigned {
120128
err = app.DB.Unlock(lockId)
129+
success = success && err == nil
121130
if err != nil {
122131
log.Error("[BURN EXECUTOR] Error unlocking invalid mint: ", err)
123-
return false
132+
} else {
133+
log.Debug("[BURN EXECUTOR] Unlocked invalid mint: ", doc.TransactionHash)
124134
}
125-
log.Debug("[BURN EXECUTOR] Unlocked invalid mint: ", doc.TransactionHash)
126135
}
127136

128-
log.Info("[BURN EXECUTOR] Handled invalid mint")
137+
if success {
138+
log.Info("[BURN EXECUTOR] Handled invalid mint")
139+
}
129140

130-
return true
141+
return success
131142
}
132143

133144
func (x *BurnExecutorRunner) HandleBurn(doc models.Burn) bool {
@@ -157,6 +168,14 @@ func (x *BurnExecutorRunner) HandleBurn(doc models.Burn) bool {
157168
res, err := x.client.SubmitRawTx(p)
158169
if err != nil {
159170
log.Error("[BURN EXECUTOR] Error submitting transaction: ", err)
171+
if lockId != "" && doc.Status == models.StatusSigned {
172+
err = app.DB.Unlock(lockId)
173+
if err != nil {
174+
log.Error("[BURN EXECUTOR] Error unlocking burn: ", err)
175+
} else {
176+
log.Debug("[BURN EXECUTOR] Unlocked burn: ", doc.TransactionHash)
177+
}
178+
}
160179
return false
161180
}
162181

@@ -208,22 +227,25 @@ func (x *BurnExecutorRunner) HandleBurn(doc models.Burn) bool {
208227
}
209228

210229
err := app.DB.UpdateOne(models.CollectionBurns, filter, update)
230+
success := err == nil
211231
if err != nil {
212232
log.Error("[BURN EXECUTOR] Error updating burn: ", err)
213-
return false
214233
}
215234

216235
if lockId != "" && doc.Status == models.StatusSigned {
217236
err = app.DB.Unlock(lockId)
237+
success = success && err == nil
218238
if err != nil {
219239
log.Error("[BURN EXECUTOR] Error unlocking burn: ", err)
220-
return false
240+
} else {
241+
log.Debug("[BURN EXECUTOR] Unlocked burn: ", doc.TransactionHash)
221242
}
222-
log.Debug("[BURN EXECUTOR] Unlocked burn: ", doc.TransactionHash)
223243
}
224244

225-
log.Info("[BURN EXECUTOR] Handled burn")
226-
return true
245+
if success {
246+
log.Info("[BURN EXECUTOR] Handled burn")
247+
}
248+
return success
227249
}
228250

229251
func (x *BurnExecutorRunner) SyncTxs() bool {

0 commit comments

Comments
 (0)