diff --git a/charts/rollups-node/templates/authority-claimer-deployment.yaml b/charts/rollups-node/templates/authority-claimer-deployment.yaml index dd24c09..f3eec63 100644 --- a/charts/rollups-node/templates/authority-claimer-deployment.yaml +++ b/charts/rollups-node/templates/authority-claimer-deployment.yaml @@ -55,7 +55,8 @@ spec: - --dapp-deployment-file=/deployments/localhost/dapp.json {{- else }} - {{ print "--rollups-deployment-file=/opt/cartesi/share/deployments/" (required "A valid .Values.dapp.network is required" .Values.dapp.network | replace "-" "_") ".json" | quote }} - - {{ print "--dapp-deployment-file=/deployments/" (required "A valid .Values.dapp.network is required" .Values.dapp.network | replace "-" "_") "/dapp.json" | quote }} + - {{ print "--dapp-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }} + - {{ print "--dapp-deploy-block-hash=" (required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash) | quote }} {{- end }} {{- if (or .Values.dapp.mnemonic.value .Values.dapp.mnemonic.secretRef .Values.localnode.enabled) }} - {{ print "--tx-signing-mnemonic-file=/var/run/secrets/mnemonic/MNEMONIC" | quote }} @@ -115,10 +116,6 @@ spec: - name: deployments mountPath: /deployments readOnly: false - {{- else }} - - name: dapp - mountPath: "/deployments/{{ .Values.dapp.network }}/" - readOnly: true {{- end}} {{- if .Values.authorityClaimer.extraVolumeMounts }} {{- include "tplvalues.render" ( dict "value" .Values.authorityClaimer.extraVolumeMounts "context" $ ) | nindent 12 }} @@ -135,12 +132,6 @@ spec: {{- end }} - name: authority-claimer-lib emptyDir: {} - - name: dapp - configMap: - name: "{{ include "validator.fullname" . }}-dapp" - items: - - key: "dapp.json" - path: "dapp.json" {{- if (or .Values.dapp.mnemonic.value .Values.localnode.enabled .Values.dapp.mnemonic.secretRef) }} - name: mnemonic secret: diff --git a/charts/rollups-node/templates/dapp-configmap.yaml b/charts/rollups-node/templates/dapp-configmap.yaml deleted file mode 100644 index 9899283..0000000 --- a/charts/rollups-node/templates/dapp-configmap.yaml +++ /dev/null @@ -1,19 +0,0 @@ -{{- /* -(c) Cartesi and individual authors (see AUTHORS) -SPDX-License-Identifier: Apache-2.0 (see LICENSE) -*/}} - ---- -{{- if not .Values.localnode.enabled }} -kind: ConfigMap -apiVersion: v1 -metadata: - name: {{ include "validator.fullname" . }}-dapp - labels: {{- include "validator.labels" . | nindent 4 }} -data: - "dapp.json": | - { - "address": {{ required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress | quote }}, - "blockHash": {{ required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash | quote }}, - } -{{ end -}} diff --git a/charts/rollups-node/templates/dispatcher-deployment.yaml b/charts/rollups-node/templates/dispatcher-deployment.yaml index f53397b..f1db985 100644 --- a/charts/rollups-node/templates/dispatcher-deployment.yaml +++ b/charts/rollups-node/templates/dispatcher-deployment.yaml @@ -56,7 +56,8 @@ spec: - --dapp-deployment-file=/deployments/localhost/dapp.json {{- else }} - {{ print "--rollups-deployment-file=/opt/cartesi/share/deployments/" (required "A valid .Values.dapp.network is required" .Values.dapp.network | replace "-" "_") ".json" | quote }} - - {{ print "--dapp-deployment-file=/deployments/" (required "A valid .Values.dapp.network is required" .Values.dapp.network | replace "-" "_") "/dapp.json" | quote }} + - {{ print "--dapp-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }} + - {{ print "--dapp-deploy-block-hash=" (required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash) | quote }} {{- end }} {{- if (or .Values.dapp.network .Values.localnode.enabled) }} - {{ print "--chain-id=" (include "dapp.chainID" .) | quote }} @@ -105,10 +106,6 @@ spec: - name: deployments mountPath: /deployments readOnly: false - {{- else }} - - name: dapp - mountPath: "/deployments/{{ .Values.dapp.network }}/" - readOnly: true {{- end}} {{- if .Values.dispatcher.extraVolumeMounts }} {{- include "tplvalues.render" ( dict "value" .Values.dispatcher.extraVolumeMounts "context" $ ) | nindent 12 }} @@ -123,12 +120,6 @@ spec: persistentVolumeClaim: claimName: {{ include "validator.fullname" . }}-deployments-pvc {{- end }} - - name: dapp - configMap: - name: "{{ include "validator.fullname" . }}-dapp" - items: - - key: "dapp.json" - path: "dapp.json" {{- if (or .Values.dapp.mnemonic.value .Values.localnode.enabled .Values.dapp.mnemonic.secretRef) }} - name: mnemonic secret: