Merge pull request #46 from ethersphere/unlock_in_script

ethersphere · Sep 26, 2020 · e8afe21 · e8afe21
2 parents 8764e85 + 9037034
commit e8afe21
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/charts/geth-swap/Chart.yaml b/charts/geth-swap/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.6
+version: 0.1.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/geth-swap/templates/deployment.yaml b/charts/geth-swap/templates/deployment.yaml
@@ -65,13 +65,11 @@ spec:
             - --rpc
             - --rpcaddr
             - "0.0.0.0"
+            - --allow-insecure-unlock
+            - --http.api
+            - 'eth,net,personal'
             - --rpcvhosts
             - "*"
-            - --allow-insecure-unlock
-            - --unlock
-            - {{ .Values.geth.genesis.validatorAddress }}
-            - --password
-            - /dev/null
             - --mine
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/geth-swap/templates/setupcontracts.yaml b/charts/geth-swap/templates/setupcontracts.yaml
@@ -19,6 +19,10 @@ spec:
           - sh
           - -ac
           - >
-            while ! curl $BACKEND; do sleep 1; done;
+            set -x;
+            while ! curl -m 1 $BACKEND; do sleep 1; done;
+            echo connected to geth >&2;
+            ACCOUNT=$(curl -X POST -H "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\", \"method\": \"eth_accounts\", \"params\": [], \"id\":\"1\"}" $BACKEND | jq -r '.result | .[0]');
+            curl -H "Content-Type: application/json" --data "{\"jsonrpc\":\"2.0\", \"method\": \"personal_unlockAccount\", \"params\": [\"$ACCOUNT\", \"\", 0], \"id\":\"1\"}" $BACKEND;
             bash deploy.sh
       restartPolicy: Never