Skip to content

fix: skip unsupported chain parameters #1581

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
lumtis merged 2 commits into from
Jan 16, 2024
Merged

fix: skip unsupported chain parameters #1581

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
737736b
skip unsupported chain parameters
ws4charlie Jan 13, 2024
18563f9
Merge branch 'develop' into fix-zetaclient-supported-chains
lumtis Jan 16, 2024
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
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Getting the correct TSS address for Bitcoin now requires proviidng the Bitcoin c

### Fixes

* [1575](https://github.com/zeta-chain/node/issues/1575) - Skip unsupported chain parameters by IsSupported flag
* [1554](https://github.com/zeta-chain/node/pull/1554) - Screen out unconfirmed UTXOs that are not created by TSS itself
* [1560](https://github.com/zeta-chain/node/issues/1560) - Zetaclient post evm-chain outtx hashes only when receipt is available
* [1516](https://github.com/zeta-chain/node/issues/1516) - Unprivileged outtx tracker removal
Expand Down
15 changes: 9 additions & 6 deletions zetaclient/zetacore_bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ func (b *ZetaCoreBridge) UpdateConfigFromCore(cfg *config.Config, init bool) err
return err
}
if plan != nil && bn == plan.Height-1 { // stop zetaclients; notify operator to upgrade and restart
b.logger.Warn().Msgf("Active upgrade plan detected and upgrade height reached: %s at height %d; ZetaClient is stopped; please kill this process, replace zetaclientd binary with upgraded version, and restart zetaclientd", plan.Name, plan.Height)
b.logger.Warn().Msgf("Active upgrade plan detected and upgrade height reached: %s at height %d; ZetaClient is stopped;"+
"please kill this process, replace zetaclientd binary with upgraded version, and restart zetaclientd", plan.Name, plan.Height)
b.pause <- struct{}{} // notify CoreObserver to stop ChainClients, Signers, and CoreObservder itself
}

Expand All @@ -212,14 +213,16 @@ func (b *ZetaCoreBridge) UpdateConfigFromCore(cfg *config.Config, init bool) err
for _, chainParam := range chainParams {
err := config.ValidateChainParams(chainParam)
if err != nil {
b.logger.Debug().Err(err).Msgf(
"Invalid core params for chain %s",
common.GetChainFromChainID(chainParam.ChainId).ChainName,
)
b.logger.Warn().Err(err).Msgf("Invalid chain params for chain %d", chainParam.ChainId)
continue
}
if !chainParam.GetIsSupported() {
b.logger.Info().Msgf("Chain %d is not supported yet", chainParam.ChainId)
continue
}
if common.IsBitcoinChain(chainParam.ChainId) {
newBTCParams = chainParam
} else {
} else if common.IsEVMChain(chainParam.ChainId) {
newEVMParams[chainParam.ChainId] = chainParam
}
}
Expand Down