Changes from astriaorg/astria@acff940

astriaorg · Aug 22, 2024 · dc33081 · dc33081
1 parent 24f4a29
commit dc33081
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json
@@ -3,21 +3,21 @@
   "app_state": {
     "native_asset_base_denomination": "{{ .Values.genesis.nativeAssetBaseDenomination }}",
     "fees": {
-      "transfer_base_fee": {{ .Values.genesis.fees.transferBaseFee }},
-      "sequence_base_fee": {{ .Values.genesis.fees.sequenceBaseFee }},
-      "sequence_byte_cost_multiplier": {{ .Values.genesis.fees.sequenceByteCostMultiplier }},
-      "init_bridge_account_base_fee": {{ .Values.genesis.fees.initBridgeAccountBaseFee }},
-      "bridge_lock_byte_cost_multiplier": {{ .Values.genesis.fees.bridgeLockByteCostMultiplier }},
-      "bridge_sudo_change_fee": {{ .Values.genesis.fees.bridgeSudoChangeFee }},
-      "ics20_withdrawal_base_fee": {{ .Values.genesis.fees.ics20WithdrawalBaseFee }}
+      "transfer_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.transferBaseFee }},
+      "sequence_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequenceBaseFee }},
+      "sequence_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.sequenceByteCostMultiplier }},
+      "init_bridge_account_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.initBridgeAccountBaseFee }},
+      "bridge_lock_byte_cost_multiplier": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeLockByteCostMultiplier }},
+      "bridge_sudo_change_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.bridgeSudoChangeFee }},
+      "ics20_withdrawal_base_fee": {{ include "sequencer.toUint128Proto" .Values.genesis.fees.ics20WithdrawalBaseFee }}
     },
     "allowed_fee_assets": [
       {{- range $index, $value := .Values.genesis.allowedFeeAssets }}
       {{- if $index }},{{- end }}
       "{{ $value }}"
       {{- end }}
     ],
-    "ibc_params": {
+    "ibc_parameters": {
       "ibc_enabled": {{ .Values.genesis.ibc.enabled }},
       "inbound_ics20_transfers_enabled": {{ .Values.genesis.ibc.inboundEnabled }},
       "outbound_ics20_transfers_enabled": {{ .Values.genesis.ibc.outboundEnabled }}
@@ -30,7 +30,7 @@
       {{- if $index }},{{- end }}
       {
         "address": {{ include "sequencer.address" $value.address }},
-        "balance": {{ toString $value.balance | replace "\"" "" }}
+        "balance": {{ include "sequencer.toUint128Proto" ( toString $value.balance | replace "\"" "" ) }} 
       }
       {{- end }}
     ],

diff --git a/charts/sequencer/templates/_helpers.tpl b/charts/sequencer/templates/_helpers.tpl
@@ -71,3 +71,7 @@ name: {{ .Values.moniker }}-sequencer-metrics
 {{/* New sequencer address */}}
 {{- define "sequencer.address"}}{ "bech32m": "{{ . }}" }
 {{- end }}
+
+{{/* uint64 fee converted to a astria proto Uint128 with only lo set */}}
+{{- define "sequencer.toUint128Proto"}}{ "lo": {{ . }} }
+{{- end }}