certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Node/acct minor fixes (#2502) 

* Node/Acct: logonly should not block anything

Change-Id: Ie398596fcaf296a37a9f9a447f70a12d16c5dbe9

* Node/Acct: Increase audit interval

Change-Id: I90b59cb6a353d98a7eb210a6802946d082e0eda6

* Node/Watcher: Log txHash when reobs fails

Change-Id: I1b0b5d9ca53097d8f766264fb225f7592bd76f5b

* Remove unnecessary log message

Change-Id: I838f5e19d705cb086856199e1316b6e9592ced41

* Remove reference to devnet from log msg

Change-Id: Iffaf850751d742b253a03611b4f75f5af183c10e

* Tweak log msg

Change-Id: I98e48eed99058903a0b26c6db67bb0a06bad365b
This commit is contained in:
bruce-riley 2023-03-14 09:32:46 -05:00 committed by GitHub
parent 9802f9cf2b
commit 0dc0aefa08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/cmd/guardiand/node.go
View File

@ -994,7 +994,7 @@ func runNode(cmd *cobra.Command, args []string) {
logger.Debug("acct: loading key file", zap.String("key path", wormchainKeyPathName))
wormchainKey, err = wormconn.LoadWormchainPrivKey(wormchainKeyPathName, *wormchainKeyPassPhrase)
if err != nil {
logger.Fatal("failed to load devnet wormchain private key", zap.Error(err))
logger.Fatal("failed to load wormchain private key", zap.Error(err))
}
// Connect to wormchain.
@ -1377,7 +1377,6 @@ func runNode(cmd *cobra.Command, args []string) {
return err
}
}
logger.Info("checking for base")
if shouldStart(baseRPC) {
logger.Info("Starting Base watcher")
readiness.RegisterComponent(common.ReadinessBaseSyncing)

5
node/pkg/accountant/accountant.go
View File

@ -240,11 +240,12 @@ func (acct *Accountant) SubmitObservation(msg *common.MessagePublication) (bool,
zap.String("msgID", msgId),
zap.String("oldDigest", oldEntry.digest),
zap.String("newDigest", digest),
zap.Bool("enforcing", acct.enforceFlag),
)
} else {
acct.logger.Info("acct: blocking transfer because it is already outstanding", zap.String("msgID", msgId))
acct.logger.Info("acct: blocking transfer because it is already outstanding", zap.String("msgID", msgId), zap.Bool("enforcing", acct.enforceFlag))
}
return false, nil
return !acct.enforceFlag, nil
}
// Add it to the pending map and the database.

7
node/pkg/accountant/audit.go
View File

@ -34,7 +34,8 @@ import (
const (
// auditInterval indicates how often the audit runs.
auditInterval = 5 * time.Minute
// Make this bigger than the reobservation window (11 minutes).
auditInterval = 15 * time.Minute
// maxSubmitPendingTime indicates how long a transfer can be in the submit pending state before the audit starts complaining about it.
maxSubmitPendingTime = 30 * time.Minute
@ -262,9 +263,9 @@ func (acct *Accountant) handleMissingObservation(mo MissingObservation) {
select {
case acct.obsvReqWriteC <- msg:
acct.logger.Debug("acct: submitted local reobservation", zap.Stringer("moKey", mo))
acct.logger.Debug("acctaudit: submitted local reobservation", zap.Stringer("moKey", mo))
default:
acct.logger.Error("acct: unable to submit local reobservation because the channel is full, will try next interval", zap.Stringer("moKey", mo))
acct.logger.Error("acctaudit: unable to submit local reobservation because the channel is full, will try next interval", zap.Stringer("moKey", mo))
}
}

3
node/pkg/watchers/evm/watcher.go
View File

@ -425,7 +425,8 @@ func (w *Watcher) Run(ctx context.Context) error {
if err != nil {
logger.Error("failed to process observation request",
zap.Error(err), zap.String("eth_network", w.networkName))
zap.Error(err), zap.String("eth_network", w.networkName),
zap.String("tx_hash", tx.Hex()))
continue
}