oxheadalpha · nicolasochem · Dec 10, 2023 · Dec 10, 2023 · Dec 10, 2023 · Dec 10, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,52 +76,6 @@ jobs:
   #     - name: pytest
   #       run: pytest tests
 
-  publish_mkchain:
-    needs: check-lint-and-format
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      # after we test that the module works on all systems we only need to build one since this is a pure python module
-      matrix:
-        python-version: [3.8]
-        os: [ubuntu-latest]
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pyyaml
-          pip install wheel
-
-      - name: Build Python package
-        run: python setup.py bdist_wheel
-        working-directory: mkchain
-
-      - name: Install wheels
-        run: pip install dist/*.whl
-        working-directory: mkchain
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: "**/mkchain/dist/*.whl"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish package to PyPI
-        if: github.event_name == 'release' && github.event.action == 'created'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
-          packages_dir: mkchain/dist/
 
   list_containers_to_publish:
     # based on
@@ -272,13 +226,13 @@ jobs:
             # Update Chart.yaml with release version
             yq e ".version = \"$RELEASE_VERSION\"" -i "$chart/Chart.yaml"
 
-            # Get oxheadalpha/tezos-k8s images specified in values.yaml
+            # Get tacoinfra/tezos-k8s images specified in values.yaml
             tq_images=$(yq e '(.tezos_k8s_images[]) | path | .[-1]' "$chart/values.yaml")
 
             # Update the release version of each of tezos-k8s images
             for image in $tq_images; do
-              image_name=$(yq e ".tezos_k8s_images.$image" $chart/values.yaml | sed -E "s/ghcr.io\/oxheadalpha\/tezos-k8s-(.*):.*/\1/")
-              yq e ".tezos_k8s_images.$image = \"ghcr.io/oxheadalpha/tezos-k8s-$image_name:$RELEASE_VERSION\"" -i $chart/values.yaml
+              image_name=$(yq e ".tezos_k8s_images.$image" $chart/values.yaml | sed -E "s/ghcr.io\/tacoinfra\/tezos-k8s-(.*):.*/\1/")
+              yq e ".tezos_k8s_images.$image = \"ghcr.io/tacoinfra/tezos-k8s-$image_name:$RELEASE_VERSION\"" -i $chart/values.yaml
             done
           done
 

diff --git a/.github/workflows/docusaurus.yml b/.github/workflows/docusaurus.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version: "16"
       # Install and build Docusaurus website
       - name: Build Docusaurus website
         run: |

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -32,14 +32,14 @@ Chart.yaml does not require an `appVersion`. So we are not using it as it doesn'
 
 Regarding chart dependencies, Chart.yaml should not specify a dependency version for another _local_ chart.
 
-Being that all charts are bumped to the same version on release, the parent chart will get the latest version of the dependency by default (which is the same as its own version) when installing via our Helm chart [repo](https://github.com/oxheadalpha/tezos-helm-charts).
+Being that all charts are bumped to the same version on release, the parent chart will get the latest version of the dependency by default (which is the same as its own version) when installing via our Helm chart [repo](https://github.com/tacoinfra/tezos-helm-charts).
 
 ## Run local development chart
 
 Instructions as per README install the latest release of tezos-k8s helm chart from a helm repository. To install a development version of a tezos chart in the charts/tezos directory instead, run:
 
 ```
-helm install tezos-mainnet charts/tezos --namespace oxheadalpha --create-namespace
+helm install tezos-mainnet charts/tezos --namespace tacoinfra --create-namespace
 ```
 
 # Creating Docker Images
@@ -50,7 +50,7 @@ Here is an example of the flow for creating new images and how they are publishe
 
 - You are creating a new image that you call `chain-initiator`. Name its folder `chain-initiator`. This folder should contain at least a `Dockerfile`.
 
-- The CI on release will pre-pend `tezos-k8s` to the folder name, so `tezos-k8s-chain-initiator`. That is what the image will be named on Docker Hub under the `oxheadalpha` repo. So you would pull/push `oxheadalpha/tezos-k8s-chain-initiator`. All of our image names will have this format.
+- The CI on release will pre-pend `tezos-k8s` to the folder name, so `tezos-k8s-chain-initiator`. That is what the image will be named on Docker Hub under the `tacoinfra` repo. So you would pull/push `tacoinfra/tezos-k8s-chain-initiator`. All of our image names will have this format.
 
 - In Helm charts that will be using the new image, set in the `values.yaml` file under the field `tezos_k8s_images` the value of `tezos-k8s-chain-initiator:dev`. (Any other images that a chart uses that it just pulls from a remote registry should go under the `images` field.) This is how the file will be stored in version control. On releases, the CI will set the tags to the release version and publish that to Docker Hub.
 
@@ -68,8 +68,7 @@ Here is an example of the flow for creating new images and how they are publishe
 
 Upon release, every component of the tezos-k8s repo will be bumped to that version. This is regardless if there were changes or not to that particular component. This is because tezos-k8s is a monorepo and we'd like to keep the versions consistent across the different components.
 
-- mkchain will be published to pypi
 - Docker images will be deployed to Docker Hub
-- Helm charts will be deployed to our Github Pages [repo](https://github.com/oxheadalpha/tezos-helm-charts)
+- Helm charts will be deployed to our Github Pages [repo](https://github.com/tacoinfra/tezos-helm-charts)
 
 See the Github CI file [./.github/workflows/ci.yml](.github/workflows/ci.yml) for our full CI pipeline.
diff --git a/README.md b/README.md
@@ -2,11 +2,9 @@
 
 Tezos-k8s is a collection of Helm charts and container images that can be used to deploy Tezos blockchain infrastructure on a Kubernetes cluster.
 
-Tezos-k8s is actively maintained by the team at Oxhead Alpha, a Tezos core development company.
-
 ## Documentation
 
-All documentation is at [Tezos-k8s.xyz](https://tezos-k8s.xyz).
+All documentation is at [Tezos-k8s.io](https://tezos-k8s.io).
 
 ## Development
 

diff --git a/charts/pyrometer/values.yaml b/charts/pyrometer/values.yaml
@@ -1,7 +1,7 @@
 images:
   pyrometer: registry.gitlab.com/tezos-kiln/pyrometer:latest
 tezos_k8s_images:
-  utils: ghcr.io/oxheadalpha/tezos-k8s-utils:master
+  utils: ghcr.io/tacoinfra/tezos-k8s-utils:main
 # Pass below the pyrometer config, in yaml format
 config:
   node_monitor:

diff --git a/charts/snapshotEngine/README.md b/charts/snapshotEngine/README.md
@@ -28,7 +28,7 @@ Check out [xtz-shots.io](xtz-shots.io) for an example.
 
 ## What is it?
 
-The Snapshot Engine is a Helm Chart to be deployed on a Kubernetes Cluster.  It will deploy snapshottable Tezos nodes [tezos-k8s](https://github.com/oxheadalpha/tezos-k8s) and produce Tezos `.rolling` snapshot files as well as a new archive and rolling finalized filesystem tarballs in LZ4 format for fast Tezos node syncing.
+The Snapshot Engine is a Helm Chart to be deployed on a Kubernetes Cluster.  It will deploy snapshottable Tezos nodes [tezos-k8s](https://github.com/tacoinfra/tezos-k8s) and produce Tezos `.rolling` snapshot files as well as a new archive and rolling finalized filesystem tarballs in LZ4 format for fast Tezos node syncing.
 
 ## Requirements
 
@@ -129,7 +129,7 @@ The Snapshot Engine is a Helm Chart to be deployed on a Kubernetes Cluster.  It
 5. Add our Helm repository.
 
 ```bash
-helm repo add oxheadalpha https://oxheadalpha.github.io/tezos-helm-charts/
+helm repo add tacoinfra https://tacoinfra.github.io/tezos-helm-charts/
 ```
 
 6. Deploy the chart feeding in the ARN of the IAM role you created above inline, or as as value in a values.yaml file.

diff --git a/charts/snapshotEngine/values.yaml b/charts/snapshotEngine/values.yaml
@@ -1,5 +1,5 @@
 tezos_k8s_images:
-  snapshotEngine: ghcr.io/oxheadalpha/tezos-k8s-snapshotengine:master
+  snapshotEngine: ghcr.io/tacoinfra/tezos-k8s-snapshotengine:main
 
 # the tezos version used to run `octez-node snapshot import/export`
 images:
@@ -52,13 +52,13 @@ snapshotWebsiteDomainName: ""
 # snapshotEngine generates static webpages to accompany the generated
 # artifacts. They are rendered by jekyll.
 # See an example jekyll template at:
-#   https://github.com/oxheadalpha/xtz-shots-website/
+#   https://github.com/tacoinfra/xtz-shots-website/
 # 1 parameter needs to be passed:
 # * jekyllRemoteThemeRepository: the github repository, in format organization/reponame@branch
 #   This repo@branch will be cloned into the jekyll container. This repo must contain a _config.yml
 #   and desired jekyll page templates.
 # Example:
-# jekyllRemoteThemeRepository: oxheadalpha/xtz-shots-website@main
+# jekyllRemoteThemeRepository: tacoinfra/xtz-shots-website@main
 jekyllRemoteThemeRepository: ""
 
 # When setting up the CSI driver in Kubernetes to create a snapshottable storage class
@@ -98,6 +98,6 @@ artifactDelay:
   archive: 0m
 
 # URL to schema.json file to validate generated metadata against
-schemaUrl: "https://oxheadalpha.com/tezos-snapshot-metadata.schema.1.0.json"
+schemaUrl: "https://tacoinfra.com/tezos-snapshot-metadata.schema.1.0.json"
 
 s3BucketOverride: ""
diff --git a/charts/tezos-faucet/values.yaml b/charts/tezos-faucet/values.yaml
@@ -1,9 +1,9 @@
-# Faucet backend: https://github.com/oxheadalpha/tezos-faucet-backend
-# Faucet frontend: https://github.com/oxheadalpha/tezos-faucet
+# Faucet backend: https://github.com/tacoinfra/tezos-faucet-backend
+# Faucet frontend: https://github.com/tacoinfra/tezos-faucet
 
 images:
-  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.2.1
-  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.2.0
+  tezosFaucet: ghcr.io/tacoinfra/tezos-faucet:2.2.1
+  tezosFaucetBackend: ghcr.io/tacoinfra/tezos-faucet-backend:2.2.0
 
 # Frontend app configuration. You can optionally deploy only the faucet backend.
 enableUI: true
@@ -13,7 +13,7 @@ config:
     googleCaptchaSiteKey: "" # 6LefC8QmAAAAAIX...
     # Default value assumes faucet backend is available on localhost.
     backendUrl: http://localhost:3000
-    githubRepo: https://github.com/oxheadalpha/tezos-faucet
+    githubRepo: https://github.com/tacoinfra/tezos-faucet
   network:
     name: Custom
     # Default value assumes node RPC is available on localhost.

diff --git a/charts/tezos-proto-cruncher/README.md b/charts/tezos-proto-cruncher/README.md
@@ -5,7 +5,7 @@ of a vanity protocol name.
 
 It leverages this project:
 
-https://github.com/oxheadalpha/tz-proto-vanity
+https://github.com/tacoinfra/tz-proto-vanity
 
 It runs in a daemonset and uploads matches to a bucket.
 

diff --git a/charts/tezos-proto-cruncher/values.yaml b/charts/tezos-proto-cruncher/values.yaml
@@ -1,5 +1,5 @@
 images:
-  tz_proto_vanity: ghcr.io/oxheadalpha/tz-proto-vanity:latest
+  tz_proto_vanity: ghcr.io/tacoinfra/tz-proto-vanity:latest
 # tezos-proto-cruncher downloads a protocol in binary format
 # from a S3 bucket, and writes the results in the same bucket.
 # Put the credentials for access to your bucket below.
@@ -26,7 +26,7 @@ numNonceDigits: 16
 # numParallelProcesses: 8
 
 tezos_k8s_images:
-  utils: ghcr.io/oxheadalpha/tezos-k8s-utils:master
+  utils: ghcr.io/tacoinfra/tezos-k8s-utils:main
 
 nameOverride: ""
 fullnameOverride: ""

diff --git a/charts/tezos-reward-distributor/values.yaml b/charts/tezos-reward-distributor/values.yaml
@@ -5,7 +5,7 @@ tezos_k8s_images:
   # snapshotEngine is needed for upload of logs to bucket
   # since it already exists, we do not create a new container
   # just for this task.
-  snapshotEngine: ghcr.io/oxheadalpha/tezos-k8s-snapshotengine:master
+  snapshotEngine: ghcr.io/tacoinfra/tezos-k8s-snapshotengine:main
 
 # The node endpoint. It must be an archive node.
 # May start with https://

diff --git a/charts/tezos-signer-forwarder/values.yaml b/charts/tezos-signer-forwarder/values.yaml
@@ -1,6 +1,6 @@
 tezos_k8s_images:
-  utils: ghcr.io/oxheadalpha/tezos-k8s-utils:master
-  tezos_signer_forwarder: ghcr.io/oxheadalpha/tezos-k8s-signerforwarder:dev
+  utils: ghcr.io/tacoinfra/tezos-k8s-utils:main
+  tezos_signer_forwarder: ghcr.io/tacoinfra/tezos-k8s-signerforwarder:main
 
 # List the endpoints below.
 # Each endpoint represents a ssh server.

diff --git a/charts/tezos/Chart.yaml b/charts/tezos/Chart.yaml
@@ -6,4 +6,4 @@ version: 0.0.0
 keywords:
   - tezos
   - blockchain
-home: https://github.com/oxheadalpha/tezos-k8s
+home: https://github.com/tacoinfra/tezos-k8s
diff --git a/charts/tezos/scripts/baker.sh b/charts/tezos/scripts/baker.sh
@@ -42,8 +42,8 @@ if [ -f /etc/tezos/baker-config/${my_baker_account}_operations_pool ]; then
   extra_args="${extra_args} --operations-pool $(cat /etc/tezos/baker-config/${my_baker_account}_operations_pool)"
 fi
 
-if [ -f /etc/tezos/baker-config/${my_baker_account}_dal_node ]; then
-  extra_args="${extra_args} --dal-node $(cat /etc/tezos/baker-config/${my_baker_account}_dal_node)"
+if [ -f /etc/tezos/baker-config/${my_baker_account}_dal_node_rpc_url ]; then
+  extra_args="${extra_args} --dal-node $(cat /etc/tezos/baker-config/${my_baker_account}_dal_node_rpc_url)"
 fi
 
 CLIENT="$TEZ_BIN/octez-client -d $CLIENT_DIR"

diff --git a/charts/tezos/scripts/dal-node.sh b/charts/tezos/scripts/dal-node.sh
@@ -10,8 +10,9 @@ extra_args=""
 if [ "${BOOTSTRAP_PROFILE}" == "true" ]; then
   extra_args="--bootstrap-profile"
 fi
-if [ "${ATTESTER_PROFILES}" != "" ]; then
-  extra_args="${extra_args} --attester-profiles ${ATTESTER_PROFILES}"
+if [ -s "${TEZ_VAR}/dal_attester_config" ]; then
+  attester_config=$(cat "/var/tezos/dal_attester_config")
+  extra_args="${extra_args} --attester-profiles ${attester_config}"
 fi
 if [ "${PEER}" != "" ]; then
   extra_args="${extra_args} --peer ${PEER}"
@@ -28,7 +29,9 @@ fi
 #
 
 CMD="$TEZ_BIN/octez-dal-node run ${extra_args} --data-dir ${DAL_DATA_DIR} \
-  --endpoint http://tezos-node-rpc:8732 \
+  --expected-pow 0 \
+  --endpoint ${NODE_RPC_URL} \
+  --metrics-addr 0.0.0.0:11733 \
   --net-addr 0.0.0.0:11732 \
   --rpc-addr 0.0.0.0:10732"
 

diff --git a/charts/tezos/scripts/rpc-baker.sh b/charts/tezos/scripts/rpc-baker.sh
@@ -0,0 +1,33 @@
+set -ex
+
+TEZ_VAR=/var/tezos
+TEZ_BIN=/usr/local/bin
+CLIENT_DIR="$TEZ_VAR/client"
+NODE_DIR="$TEZ_VAR/node"
+BAKER_EXTRA_ARGS_FROM_ENV=${BAKER_EXTRA_ARGS}
+mkdir -p $CLIENT_DIR
+
+per_block_vote_file=/etc/tezos/baker-config/${BAKER_NAME}-${PROTO_COMMAND}-per-block-votes.json
+
+if [ ! -f "$per_block_vote_file" ]; then
+  echo "Error: $per_block_vote_file not found" >&2
+  exit 1
+fi
+
+extra_args="--votefile ${per_block_vote_file}"
+
+if [ "${OPERATIONS_POOL}" != "" ]; then
+  extra_args="${extra_args} --operations-pool ${OPERATIONS_POOL}"
+fi
+
+if [ "${DAL_NODE_RPC_URL}" != "" ]; then
+  extra_args="${extra_args} --dal-node ${DAL_NODE_RPC_URL}"
+fi
+
+CLIENT="$TEZ_BIN/octez-client -d $CLIENT_DIR"
+CMD="$TEZ_BIN/octez-baker-${PROTO_COMMAND} -d $CLIENT_DIR"
+
+# ensure we can run octez-client commands without specifying client dir
+ln -s /var/tezos/client /home/tezos/.tezos-client
+
+exec $CMD --endpoint ${NODE_RPC_URL} run remotely  ${extra_args} ${BAKER_EXTRA_ARGS_FROM_ENV} ${BAKE_USING_ACCOUNTS}
diff --git a/charts/tezos/scripts/snapshot-importer.sh b/charts/tezos/scripts/snapshot-importer.sh
@@ -25,7 +25,7 @@ if [ -f ${node_dir}/chain.snapshot.block_hash ]; then
     block_hash_arg="--block $(cat ${node_dir}/chain.snapshot.block_hash)"
 fi
 
-${node} snapshot import ${snapshot_file} --data-dir ${node_data_dir}
+${node} snapshot import ${snapshot_file} --data-dir ${node_data_dir} --no-check
 find ${node_dir}
 
 rm -rvf ${snapshot_file}