Skip to content

Commit

Permalink
merge develop into inbound-tracker and unified proof verification
Browse files Browse the repository at this point in the history
  • Loading branch information
ws4charlie committed Oct 13, 2023
1 parent 30b8199 commit 6f04e8a
Show file tree
Hide file tree
Showing 101 changed files with 4,076 additions and 990 deletions.
3 changes: 2 additions & 1 deletion cmd/zetaclientd/keygen_tss.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ func keygenTss(cfg *config.Config, tss *mc.TSS, keygenLogger zerolog.Logger) err
if err != nil {
return err
}
zetaHash, err := tss.CoreBridge.PostBlameData(&res.Blame, common.ZetaChain().ChainId, digest)
index := fmt.Sprintf("keygen-%s-%d", digest, keyGen.BlockNumber)
zetaHash, err := tss.CoreBridge.PostBlameData(&res.Blame, common.ZetaChain().ChainId, index)
if err != nil {
keygenLogger.Error().Err(err).Msg("error sending blame data to core")
return err
Expand Down
14 changes: 13 additions & 1 deletion cmd/zetacored/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func NewRootCmd() (*cobra.Command, appparams.EncodingConfig) {

customAppTemplate, customAppConfig := initAppConfig()

return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, tmcfg.DefaultConfig())
return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, initTmConfig())
},
}

Expand All @@ -107,6 +107,18 @@ func initAppConfig() (string, interface{}) {
return servercfg.AppConfig(zetacoredconfig.BaseDenom)
}

// initTmConfig overrides the default Tendermint config
func initTmConfig() *tmcfg.Config {
cfg := tmcfg.DefaultConfig()

// use mempool version 1 to enable tx priority
if cfg.Mempool != nil {
cfg.Mempool.Version = tmcfg.MempoolV1
}

return cfg
}

func initRootCmd(rootCmd *cobra.Command, encodingConfig appparams.EncodingConfig) {
rootCmd.AddCommand(
ethermintclient.ValidateChainID(
Expand Down
Loading

0 comments on commit 6f04e8a

Please sign in to comment.