Taraxa-project · rattrap · Sep 19, 2022 · Sep 19, 2022 · Sep 19, 2022 · Sep 19, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -250,10 +250,6 @@ commands:
               helm upgrade -i pr-<< parameters.pr-name >> charts/taraxa-node/ --namespace blockchain-prnet -f charts/taraxa-node/values.yaml -f charts/taraxa-node/prnet.values.yaml \
                 --set image.repository=gcr.io/jovial-meridian-249123/taraxa-node \
                 --set image.tag=${PR_TAG} \
-                --set explorer.configEnvs.faucetEnabled="true" \
-                --set explorer.configEnvs.rpcHttpProvider="http://pr-<< parameters.pr-name >>-taraxa-node-1.pr-<< parameters.pr-name >>-taraxa-node:7777" \
-                --set explorer.configEnvs.rpcWsProvider="http://pr-<< parameters.pr-name >>-taraxa-node-1.pr-<< parameters.pr-name >>-taraxa-node:8777" \
-                --set explorer.configEnvs.wsProvider="wss://explorer-ws-pr-<< parameters.pr-name >>.prnet.taraxa.io" \
                 --set bootnode.loadBalancer.addresses\[0\]="${PRNET_IPS_BOOT_NODES[0]}" \
                 --set bootnode.loadBalancer.addresses\[1\]="${PRNET_IPS_BOOT_NODES[1]}" \
                 --set bootnode.loadBalancer.addresses\[2\]="${PRNET_IPS_BOOT_NODES[2]}" \
@@ -329,12 +325,6 @@ jobs:
           when: on_success
           comment: "\
             <h3><p>PR NET pr-<< pipeline.parameters.pr_number >> Successfully deployed!</p></h3>\
-            <table>\
-            <tr><td>explorer</td><td><a href=https://explorer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io >\
-            https://explorer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr> \
-            <tr><td>RPC</td><td><a href=https://rpc-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io >\
-            https://rpc-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr>\
-            </table>\
             <h4><p>Boot Nodes</p></h4>\
             <table>\
             <tr><td>Boot Node 1</td><td>${PRNET_IPS_BOOT_NODES[0]}</td></tr>\
@@ -379,12 +369,6 @@ jobs:
           when: on_success
           comment: "\
             <h3><p>PR NET pr-<< pipeline.parameters.pr_number >> Successfully Re deployed!</p></h3>\
-            <table>\
-            <tr><td>explorer</td><td><a href=https://explorer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io >\
-            https://explorer-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr> \
-            <tr><td>RPC</td><td><a href=https://rpc-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io >\
-            https://rpc-pr-<<pipeline.parameters.pr_number>>.prnet.taraxa.io </a></td></tr>\
-            </table>\
             <h4><p>Boot Nodes</p></h4>\
             <table>\
             <tr><td>Boot Node 1</td><td>${PRNET_IPS[0]}</td></tr>\

diff --git a/charts/taraxa-node/CHANGELOG.md b/charts/taraxa-node/CHANGELOG.md
@@ -3,12 +3,12 @@
 This file documents all notable changes to `taraxa-node` Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
-
-## v0.1.10
+## v0.2.0
 
 ### Major changes
 
-* Change in prefix for chain IDs
+* Removes explorer dependancy
+
 
 ## v0.2.0
 
@@ -22,4 +22,11 @@ numbering uses [semantic versioning](http://semver.org).
 
 ### Patches
 
-* Fixes RPC nodes initconfig wrong validators
+* Fixes RPC nodes initconfig wrong validators
+
+
+## v0.1.10
+
+### Major changes
+
+* Change in prefix for chain IDs
diff --git a/charts/taraxa-node/Chart.yaml b/charts/taraxa-node/Chart.yaml
@@ -2,13 +2,8 @@ apiVersion: v2
 appVersion: "1.0"
 description: Kubernetes helm chart for Taraxa blockchain full node implementation.
 name: taraxa-node
-version: 0.2.0
+version: 0.3.0
 keywords:
 - blockchain
 - taraxa
-- node
-dependencies:
-  - name: explorer
-    version: 0.1.7
-    condition: explorer.enabled
-    repository: https://charts.gcp.taraxa.io
+- node
diff --git a/charts/taraxa-node/templates/consensus-node.yaml b/charts/taraxa-node/templates/consensus-node.yaml
@@ -33,16 +33,6 @@ spec:
         kubernetes.io/change-cause: "Configuration through configmaps."
     spec:
       initContainers:
-        {{ if .Values.explorer.enabled }}
-        - name: wait-for-explorer
-          image: dwdraju/alpine-curl-jq:latest
-          command: ["/bin/entrypoint.sh"]
-          volumeMounts:
-            - name: explorer-check
-              mountPath: /bin/entrypoint.sh
-              readOnly: true
-              subPath: entrypoint.sh
-        {{- end }}
         - name: config-adapter
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -160,12 +150,6 @@ spec:
           configMap:
             defaultMode: 0700
             name: {{ .Release.Name }}-consensus-node-init-script
-        {{ if .Values.explorer.enabled }}
-        - name: explorer-check
-          configMap:
-            defaultMode: 0700
-            name: {{ include "taraxa-node.fullname" . }}-explorer-check
-        {{- end }}
         {{- if .Values.slack.enabled }}
         - name: status-requirements
           configMap:

diff --git a/charts/taraxa-node/templates/explorer-check.yaml b/charts/taraxa-node/templates/explorer-check.yaml
diff --git a/charts/taraxa-node/templates/initconfig-consensus-node.yaml b/charts/taraxa-node/templates/initconfig-consensus-node.yaml
@@ -114,28 +114,13 @@ data:
         echo "No predifined keys. Generating new wallet..."
         KEY=$(taraxad --command account | grep node_secret | cut -d\  -f3- | tr -d \")
         VRF=$(taraxad --command vrf | grep vrf_secret | cut -d\  -f3 | tr -d \")
-        {{ if .Values.explorer.enabled }}
-        NODE_ADDRESS=$(taraxad --command account ${KEY} | grep node_address | cut -d\  -f3 | tr -d \")
-        echo "New wallet: 0x${NODE_ADDRESS}"
-
-        SIG=$(taraxa-sign sign --key 0x${EXPLORER_DELEGATION_PRIVATE_KEY} 0x${NODE_ADDRESS})
-
-        curl --silent http://{{ .Release.Name }}-explorer/api/delegate/0x${NODE_ADDRESS}?sig=${SIG}
-        {{- end }}
       else
         echo "Found wallet file."
         KEY=$(cat "$WALLET_PATH" | jq -r .node_secret)
         VRF=$(cat "$WALLET_PATH" | jq -r .vrf_secret)
       fi
     fi
 
-    {{ if .Values.explorer.enabled }}
-    {{- if and (ne .Values.config.network "841") (ne .Values.config.network "842") (ne .Values.config.network "843") }}
-    NODE_ADDRESS=$(taraxad --command account ${KEY} | grep node_address | cut -d\  -f3 | tr -d \")
-    curl --silent http://{{ .Release.Name }}-explorer/api/faucet/0x${NODE_ADDRESS}
-    {{- end }}
-    {{- end }}
-
     taraxad --command config \
       --chain-id {{ .Values.config.network }} \
       --node-secret ${KEY} \
@@ -159,11 +144,9 @@ data:
     {{- end }}
 
     {{- if and (ne .Values.config.network "841") (ne .Values.config.network "842") (ne .Values.config.network "843") }}
-    {{ if .Values.explorer.enabled }}
-    export FAUCET_ADDRESS=$(taraxad --command account ${EXPLORER_FAUCET_PRIVATE_KEY} | grep node_address | cut -d\  -f3 | tr -d \")
+    export FAUCET_ADDRESS=$(taraxad --command account ${FAUCET_PRIVATE_KEY} | grep node_address | cut -d\  -f3 | tr -d \")
     cat $CONFIG_PATH | jq '.chain_config.final_chain.state.genesis_balances += ({("0x"+env.FAUCET_ADDRESS): "0x1027e72f1f12813088000000"})' > $CONFIG_PATH.tmp && mv $CONFIG_PATH.tmp $CONFIG_PATH
     {{- end }}
-    {{- end }}
 
     cat $CONFIG_PATH
 {{- end }}
diff --git a/charts/taraxa-node/templates/initconfig-node.yaml b/charts/taraxa-node/templates/initconfig-node.yaml
@@ -146,11 +146,9 @@ data:
     {{- end }}
 
     {{- if and (ne .Values.config.network "841") (ne .Values.config.network "842") (ne .Values.config.network "843") }}
-    {{ if .Values.explorer.enabled }}
-    export FAUCET_ADDRESS=$(taraxad --command account ${EXPLORER_FAUCET_PRIVATE_KEY} | grep node_address | cut -d\  -f3 | tr -d \")
+    export FAUCET_ADDRESS=$(taraxad --command account ${FAUCET_PRIVATE_KEY} | grep node_address | cut -d\  -f3 | tr -d \")
     cat $CONFIG_PATH | jq '.chain_config.final_chain.state.genesis_balances += ({("0x"+env.FAUCET_ADDRESS): "0x1027e72f1f12813088000000"})' > $CONFIG_PATH.tmp && mv $CONFIG_PATH.tmp $CONFIG_PATH
     {{- end }}
-    {{- end }}
 
     cat $CONFIG_PATH
 {{- end }}
diff --git a/charts/taraxa-node/templates/secrets.yaml b/charts/taraxa-node/templates/secrets.yaml
@@ -34,7 +34,7 @@ data:
   BOOT_NODE_VRF_{{ $key }}: {{ $value | b64enc | quote }}
   {{- end }}
   SLACK_TOKEN: {{ .Values.slack.token | b64enc | quote }}
-  EXPLORER_DELEGATION_PRIVATE_KEY: {{ .Values.config.consensusnode.explorerDelegationPrivateKey | b64enc | quote }}
-  EXPLORER_FAUCET_PRIVATE_KEY: {{ .Values.explorer.faucet.privKey | b64enc | quote }}
+  DELEGATION_PRIVATE_KEY: {{ .Values.config.delegationPrivateKey | b64enc | quote }}
+  FAUCET_PRIVATE_KEY: {{ .Values.config.faucetPrivateKey | b64enc | quote }}
 {{- end }}
 {{- end }}