cardano-node: bump to tip of master

* fixes entrypoint to use topology with named environments
albertodvp · May 21, 2022 · 96e2ee7 · 96e2ee7
1 parent 433bb52
commit 96e2ee7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -15,7 +15,7 @@
     # --------------------------------------------------------------
     # --- Bride Heads ----------------------------------------------
     # TODO: remove when moved to monorepo
-    cardano-node.url = "github:input-output-hk/cardano-node/jordan/dep-bump-protocol-in-block";
+    cardano-node.url = "github:input-output-hk/cardano-node";
     cardano-db-sync.url = "github:input-output-hk/cardano-db-sync/12.0.1-flake-improvements";
     cardano-wallet.url = "github:input-output-hk/cardano-wallet";
     cardano-ogmios.url = "github:input-output-hk/cardano-ogmios";

diff --git a/nix/cardano/entrypoints.nix b/nix/cardano/entrypoints.nix
@@ -29,6 +29,7 @@
       echo "Using the preset environment $ENVIRONMENT ..." > /dev/stderr
 
       NODE_CONFIG="$DATA_DIR/config/$ENVIRONMENT/config.json"
+      NODE_TOPOLOGY="''${NODE_TOPOLOGY:-$DATA_DIR/config/$ENVIRONMENT/topology.json}"
 
     # CASE: premissioned long running environment
     elif [ -n "''${CONSUL_KV_PATH:-}" ] || [ -n "''${VAULT_KV_PATH:-}" ]; then