From 723f759f2df3e731326e57f39aeff08a2aa69c66 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@matterlabs.dev>
Date: Wed, 26 Jun 2024 09:39:19 +0200
Subject: [PATCH] chore: update nixsgx flake and minor fixes

* Refine Docker image tagging process in GitHub workflow build_and_publish_tee.yaml to optimally include variable IMAGE_TAG.
* Update nixos-sgx dependency in flake.lock with latest revisions and hashes.
* Add '.direnv' directory to .gitignore to prevent environmental configs from being tracked.

Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
---
 .github/workflows/build_and_publish_tee.yaml | 4 ++--
 .gitignore                                   | 1 +
 flake.lock                                   | 6 +++---
 flake.nix                                    | 5 +++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_and_publish_tee.yaml b/.github/workflows/build_and_publish_tee.yaml
index 72d3648..d78df32 100644
--- a/.github/workflows/build_and_publish_tee.yaml
+++ b/.github/workflows/build_and_publish_tee.yaml
@@ -83,7 +83,7 @@ jobs:
       - name: Push Docker image to matterlabs-infra
         if: ${{ !startsWith(github.ref, 'refs/tags') }}
         run: |
-          docker tag "${{ steps.build.outputs.IMAGE_TAG}}" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest"
+          docker tag "${{ steps.build.outputs.IMAGE_TAG }}" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest"
           docker push "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest"
-          docker tag "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:latest" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:${{ steps.flux.outputs.BUILD_ID }}"
+          docker tag "${{ steps.build.outputs.IMAGE_TAG }}" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:${{ steps.flux.outputs.BUILD_ID }}"
           docker push "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/fee-withdrawer-v2-tee:${{ steps.flux.outputs.BUILD_ID }}"
diff --git a/.gitignore b/.gitignore
index eb79dd5..10c12eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .idea
+.direnv
diff --git a/flake.lock b/flake.lock
index e98c43d..7da2e76 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         "snowfall-lib": "snowfall-lib"
       },
       "locked": {
-        "lastModified": 1717758565,
-        "narHash": "sha256-yscuZ3ixjwTkqS6ew5cB3Uvy9e807szRlMoPSyQuRJM=",
+        "lastModified": 1718961396,
+        "narHash": "sha256-RAyAHji/WLd7W/rMlDSC9XO5VREVFRuVo/LK0a9QIEI=",
         "owner": "matter-labs",
         "repo": "nixsgx",
-        "rev": "49a1ae79d92ccb6ed7cabfe5c5042b1399e3cd3e",
+        "rev": "f6c55e4229be64e146679c2f77e48ba8351ba77b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 05bb3ce..9c7accc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,11 @@
 {
   description = "era-fee-withdrawer";
 
+  nixConfig = {
+    extra-substituters = ["https://nixsgx.cachix.org"];
+    extra-trusted-public-keys = ["nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE="];
+  };
+
   inputs = {
     nixsgx-flake.url = "github:matter-labs/nixsgx";
     nixpkgs.follows = "nixsgx-flake/nixpkgs";