diff --git a/flake.lock b/flake.lock index 912ab32bd3..188403c9aa 100644 --- a/flake.lock +++ b/flake.lock @@ -2658,16 +2658,15 @@ "utils": "utils_36" }, "locked": { - "lastModified": 1653068905, + "lastModified": 1653097473, "narHash": "sha256-e3oGTITOdPjg3q5invFVSUWKv2QqpnH5/3KqKiVAkTY=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "b4308efbbddf0472f9c792ac3855c6e16f840953", + "rev": "d0b0fa10ac83dc1d0d40aaf294cfded1b455a0a4", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "jordan/dep-bump-protocol-in-block", "repo": "cardano-node", "type": "github" } diff --git a/flake.nix b/flake.nix index a92fcb2049..719248e82c 100644 --- 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 index 6e806db1e4..30ec0558a1 100644 --- 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