make sure burrow restore has validator address (#12972)

Signed-off-by: Gregory Hill <greg.hill@monax.io>

stable/burrow/Chart.yaml

@@ -1,5 +1,5 @@
 name: burrow
-version: 1.1.5
+version: 1.1.6
 appVersion: 0.25.0
 description: Burrow is a permissionable smart contract machine
 home: https://github.com/hyperledger/burrow

stable/burrow/templates/configmap.yaml

@@ -9,6 +9,7 @@ metadata:
   name: {{ template "burrow.fullname" . }}-config
 data:
   burrow.toml: |-
+    BurrowDir = ".burrow"
     [Tendermint]
       Seeds = ""
       SeedMode = false
@@ -16,7 +17,6 @@ data:
       ListenAddress = "tcp://0.0.0.0:{{ .Values.peer.service.port }}"
       ExternalAddress = ""
       Moniker = ""
-      TendermintRoot = ".burrow"
     [Execution]
     [Keys]
       GRPCServiceEnabled = true

stable/burrow/templates/deployments.yaml

@@ -61,7 +61,7 @@ spec:
               cp nodekey-Validator_{{ . }} {{ $workDir }}/.burrow/config/node_key.json && \
               chmod 600 {{ $workDir }}/.burrow/config/node_key.json
 {{- if $.Values.chain.restore.enabled }}
-        - name: retreive
+        - name: retrieve
           image: appropriate/curl
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           workingDir: {{ $workDir }}
@@ -82,13 +82,23 @@ spec:
           - burrow
           args:
           - restore
+          - --config
+          - "{{ $refDir }}/burrow.toml"
+          - --genesis
+          - "{{ $refDir }}/genesis.json"
           - dumpFile
+          - --validator-address
+          - {{ (index $.Values.validatorAddresses ( printf "Validator_%d" $nodeIndex )).Address | quote }}
+          - --validator-moniker
+          - {{ printf "%s-validator-%s" $.Values.organization $nodeNumber | quote }}
           volumeMounts:
             - mountPath: {{ $workDir }}
               name: work-dir
+            - mountPath: {{ $refDir }}
+              name: ref-dir
 {{- end }}
       containers:
-        - name: burrow
+        - name: node
           image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           workingDir: {{ $workDir }}