feat(v7)!: update hermes config (backport #1064) (#1068)

* feat!: update hermes config (#1064) * feat!: update hermes config * chore: upgrade to hermes 1.8.2 (cherry picked from commit 0ea0168) # Conflicts: # relayer/hermes/hermes_config.go # relayer/hermes/hermes_relayer.go * fix merge * add back in CCVConsumerChain & Type * add TrustedNode * rm duplicate --------- Co-authored-by: Rootul P <[email protected]> Co-authored-by: Reece Williams <[email protected]>
strangelove-ventures · Apr 23, 2024 · 07af56f · 07af56f
1 parent e9641ff
commit 07af56f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/relayer/hermes/hermes_config.go b/relayer/hermes/hermes_config.go
@@ -19,15 +19,13 @@ func NewConfig(chainConfigs ...ChainConfig) Config {
 		}
 
 		chains = append(chains, Chain{
-			ID:               chainCfg.ChainID,
-			Type:             "CosmosSdk",
-			CCVConsumerChain: false,
-			RPCAddr:          hermesCfg.rpcAddr,
-			GrpcAddr:         fmt.Sprintf("http://%s", hermesCfg.grpcAddr),
+			ID:       chainCfg.ChainID,
+			RPCAddr:  hermesCfg.rpcAddr,
+			GrpcAddr: fmt.Sprintf("http://%s", hermesCfg.grpcAddr),
 			EventSource: EventSource{
 				Mode:       "push",
-				URL:        strings.ReplaceAll(fmt.Sprintf("%s/websocket", hermesCfg.rpcAddr), "http", "ws"),
-				BatchDelay: "500ms",
+				Url:        strings.ReplaceAll(fmt.Sprintf("%s/websocket", hermesCfg.rpcAddr), "http", "ws"),
+				BatchDelay: "200ms",
 			},
 			RPCTimeout:    "10s",
 			TrustedNode:   false,
@@ -153,12 +151,6 @@ type TracingServer struct {
 	Port    int  `toml:"port"`
 }
 
-type EventSource struct {
-	Mode       string `toml:"mode"`
-	URL        string `toml:"url"`
-	BatchDelay string `toml:"batch_delay"`
-}
-
 type AddressType struct {
 	Derivation string `toml:"derivation"`
 }
@@ -173,9 +165,14 @@ type TrustThreshold struct {
 	Denominator string `toml:"denominator"`
 }
 
+type EventSource struct {
+	Mode       string `toml:"mode"`
+	Url        string `toml:"url"`
+	BatchDelay string `toml:"batch_delay"`
+}
+
 type Chain struct {
 	ID               string         `toml:"id"`
-	Type             string         `toml:"type"`
 	CCVConsumerChain bool           `toml:"ccv_consumer_chain"`
 	RPCAddr          string         `toml:"rpc_addr"`
 	GrpcAddr         string         `toml:"grpc_addr"`

diff --git a/relayer/hermes/hermes_relayer.go b/relayer/hermes/hermes_relayer.go
@@ -18,7 +18,7 @@ import (
 const (
 	hermes                  = "hermes"
 	defaultContainerImage   = "ghcr.io/informalsystems/hermes"
-	DefaultContainerVersion = "v1.7.1"
+	DefaultContainerVersion = "1.8.2"
 
 	hermesDefaultUidGid = "1000:1000"
 	hermesHome          = "/home/hermes"