add and use template function to evaluate fullchain dict from just th…

…e name, used in all relayers (#256)

charts/devnet/templates/_helpers.tpl

@@ -23,6 +23,24 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Given the name of the name, return full chain, merged with the default chain
+Usage:
+{{ include "devnet.fullchain" (dict "name" "osmosis-1" "defaultFile" $defaultFile "context" $) }}
+*/}}
+{{- define "devnet.fullchain" -}}
+{{ $defaultFile := .defaultFile }}
+{{ $fullchain := dict }}
+{{- range $chain := .context.Values.chains }}
+{{- if eq $chain.name .name }}
+{{ $defaultChain := get $defaultFile.defaultChains $chain.type | default dict }}
+{{ $chain = merge $chain $defaultChain }}
+{{ $fullchain = $chain }}
+{{- end }}
+{{- end }}
+{{ mustToJson $fullchain }}
+{{- end }}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

charts/devnet/templates/relayers/go-relayer/configmap.yaml

@@ -1,4 +1,5 @@
 {{- $keys := .Files.Get "configs/keys.json" | fromJson }}
+{{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
 {{- range $relayer := .Values.relayers }}
 {{- if eq $relayer.type "go-relayer" }}
 ---
@@ -22,11 +23,7 @@ data:
     }
 
   {{- range $i, $chain := $relayer.chains }}
-  {{- range $fullchain := $.Values.chains }}
-  {{- if eq $fullchain.name $chain }}
-  {{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
-  {{ $defaultChain := get $defaultFile.defaultChains $fullchain.type | default dict }}
-  {{ $fullchain = merge $fullchain $defaultChain }}
+  {{ $fullchain := include "devnet.fullchain" (dict "name" $chain "defaultFile" $defaultFile "context" $) | mustFromJson }}
   {{ $fullchain.name }}.json: |-
     {
       "type": "cosmos",
@@ -46,8 +43,6 @@ data:
       }
     }
   {{- end }}
-  {{- end }}
-  {{- end }}
 ---
 {{- end }}
 {{- end }}

charts/devnet/templates/relayers/go-relayer/statefulset.yaml

@@ -60,11 +60,7 @@ spec:
               rly config init
 
               {{- range $i, $chain := $relayer.chains }}
-              {{- range $fullchain := $.Values.chains }}
-              {{- if eq $fullchain.name $chain }}
-              {{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
-              {{ $defaultChain := get $defaultFile.defaultChains $fullchain.type | default dict }}
-              {{ $fullchain = merge $fullchain $defaultChain }}
+              {{ $fullchain := include "devnet.fullchain" (dict "name" $chain "defaultFile" $defaultFile "context" $) | mustFromJson }}
 
               echo "Adding {{ $fullchain.name }} chain"
               rly chains add --file "/configs/{{ $fullchain.name }}.json" {{ $fullchain.name }}
@@ -77,8 +73,6 @@ spec:
               echo "Transfer tokens to address $RLY_ADDR on {{ $fullchain.name }} chain with denom $DENOM"
               bash -e /scripts/transfer-tokens.sh $RLY_ADDR $DENOM http://{{ include "devnet.chain.name" $fullchain.name }}-genesis.$NAMESPACE.svc.cluster.local:8000/credit
               {{- end }}
-              {{- end }}
-              {{- end }}
 
               PATHEND="{{ index $relayer.chains 0 }}-{{ index $relayer.chains 1 }}"
               echo "Creating path $PATHEND"

charts/devnet/templates/relayers/hermes/configmap.yaml

@@ -83,11 +83,7 @@ data:
     # by the telemetry service. Default: 3001
     port = {{ $relayer.config.telemetry.port }}
     {{- range $i, $chain := $relayer.chains }}
-    {{- range $fullchain := $.Values.chains }}
-    {{- if eq $fullchain.name $chain }}
-    {{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
-    {{ $defaultChain := get $defaultFile.defaultChains $fullchain.type | default dict }}
-    {{ $fullchain = merge $fullchain $defaultChain }}
+    {{ $fullchain := include "devnet.fullchain" (dict "name" $chain "defaultFile" $defaultFile "context" $) | mustFromJson }}
     [[chains]]
     id = "{{ $chain }}"
     key_name = "{{ $chain }}"
@@ -125,8 +121,6 @@ data:
     gas_price = { price = 0.25, denom = "{{ $fullchain.denom }}" }
     {{- end }}
     {{- end }}
-    {{- end }}
-    {{- end }}
 ---
 {{- end }}
 {{- end }}

charts/devnet/templates/relayers/hermes/statefulset.yaml

@@ -65,11 +65,7 @@ spec:
               echo $MNEMONIC > $RELAYER_DIR/mnemonic.txt
 
               {{- range $i, $chain := $relayer.chains }}
-              {{- range $fullchain := $.Values.chains }}
-              {{- if eq $fullchain.name $chain }}
-              {{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
-              {{ $defaultChain := get $defaultFile.defaultChains $fullchain.type | default dict }}
-              {{ $fullchain = merge $fullchain $defaultChain }}
+              {{ $fullchain := include "devnet.fullchain" (dict "name" $chain "defaultFile" $defaultFile "context" $) | mustFromJson }}
               echo "Creating key for {{ $chain }}..."
               hermes keys add \
                 --chain {{ $chain }} \
@@ -81,8 +77,6 @@ spec:
               echo "Transfer tokens to address $RLY_ADDR"
               bash -e /scripts/transfer-tokens.sh $RLY_ADDR $DENOM http://{{- include "devnet.chain.name" $fullchain.name }}-genesis.$NAMESPACE.svc.cluster.local:8000/credit
               {{- end }}
-              {{- end }}
-              {{- end }}
 
               hermes create channel \
                 --a-chain {{ index $relayer.chains 0 }} \

charts/devnet/templates/relayers/ts-relayer/configmap.yaml

@@ -1,4 +1,5 @@
 {{- $keys := .Files.Get "configs/keys.json" | fromJson }}
+{{- $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
 {{- range $relayer := .Values.relayers }}
 {{- if eq $relayer.type "ts-relayer" }}
 ---
@@ -17,12 +18,8 @@ data:
     chains:
       {{- range $i, $chain := $relayer.chains }}
       {{ $chain }}:
-        {{- range $fullchain := $.Values.chains }}
-        {{- if eq $fullchain.name $chain }}
-        {{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
-        {{ $defaultChain := get $defaultFile.defaultChains $fullchain.type | default dict }}
-        {{ $fullchain = merge $fullchain $defaultChain }}
-        chain_id: {{ $chain }}
+      {{ $fullchain := include "devnet.fullchain" (dict "name" $chain "defaultFile" $defaultFile "context" $) | mustFromJson }}
+      chain_id: {{ $chain }}
         # You can include multiple RPC endpoints and it will rotate through them if
         # one is down (TODO)
         rpc:
@@ -39,8 +36,6 @@ data:
         ics20_port: 'transfer'
         estimated_block_time: {{ $.Values.timeouts.timeout_commit | toString | replace "ms" "" | float64 }}
         estimated_indexer_time: {{ $.Values.timeouts.time_iota_ms | toString | replace "ms" "" | float64 }}
-        {{- end }}
-        {{- end }}
       {{- end }}
 ---
 {{- end }}

charts/devnet/templates/relayers/ts-relayer/statefulset.yaml

@@ -69,18 +69,12 @@ spec:
               sed -i -e "s/<MNEMONIC>/$MNEMONIC/g" $RELAYER_DIR/app.yaml
 
               {{- range $i, $chain := $relayer.chains }}
-              {{- range $fullchain := $.Values.chains }}
-              {{- if eq $fullchain.name $chain }}
-              {{ $defaultFile := $.Files.Get "defaults.yaml" | fromYaml }}
-              {{ $defaultChain := get $defaultFile.defaultChains $fullchain.type | default dict }}
-              {{ $fullchain = merge $fullchain $defaultChain }}
+              {{ $fullchain := include "devnet.fullchain" (dict "name" $chain "defaultFile" $defaultFile "context" $) | mustFromJson }}
               DENOM="{{ $fullchain.denom }}"
               RLY_ADDR=$(ibc-setup keys list | grep "{{ $fullchain.name }}" | awk '{print $2}')
               echo "Transfer tokens to address $RLY_ADDR"
               bash -e /scripts/transfer-tokens.sh $RLY_ADDR $DENOM http://{{ include "devnet.chain.name" $fullchain.name }}-genesis.$NAMESPACE.svc.cluster.local:8000/credit
               {{- end }}
-              {{- end }}
-              {{- end }}
 
               if [ $RLY_INDEX -eq 0 ]; then
                 echo "Setting up default ics20 channel"