Skip to content

Commit b584a26

Browse files
authored
Merge pull request #3117 from input-output-hk/chore/ddw-1202-regenerate-dev-certs
2 parents 543ca27 + 60830f3 commit b584a26

21 files changed

+48
-286
lines changed

.buildkite/pipeline.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ steps:
1111
- label: 'daedalus-x86_64-darwin'
1212
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
1313
depends_on: 'trigger-x86_64-darwin'
14-
env:
15-
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
1614
agents:
1715
queue: daedalus
1816
system: x86_64-darwin
@@ -21,7 +19,6 @@ steps:
2119
command: 'scripts/with-nix-2.5.sh scripts/build-installer-unix.sh --build-id $BUILDKITE_BUILD_NUMBER'
2220
depends_on: 'trigger-aarch64-darwin'
2321
env:
24-
NIX_SSL_CERT_FILE: /nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt
2522
UPLOAD_DIR_OVERRIDE: UNSAFE-internal-build
2623
agents:
2724
queue: daedalus

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ installers/csl-daedalus/
5151
installers/delegation.cert
5252
installers/signing.key
5353

54-
# temporary certs for daedalus dev
55-
tls/client
56-
tls/server
57-
5854
# App packaged
5955
dist
6056
release

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
### Chores
1010

1111
- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
12+
- Added regeneration of dev TLS certificates for cardano-wallet on each nix-shell entry ([PR 3117](https://github.com/input-output-hk/daedalus/pull/3117))
1213

1314
## 5.2.0
1415

scripts/package.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ const DEFAULT_OPTS = {
3737
/^\/storybook($|\/)/,
3838
/^\/tests($|\/)/,
3939
/^\/tests-report($|\/)/,
40-
/^\/tls($|\/)/,
4140
/^\/translations($|\/)/,
4241
],
4342
};

shell.nix

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ let
5252
daedalusPkgs.daedalus-installer
5353
daedalusPkgs.darwin-launcher
5454
daedalusPkgs.mock-token-metadata-server
55+
regenerateDevCerts
5556
] ++ (with pkgs; [
5657
nix bash binutils coreutils curl gnutar
5758
git python27 curl jq
@@ -74,7 +75,17 @@ let
7475
name = "daedalus-build";
7576
buildInputs = daedalusShellBuildInputs;
7677
};
77-
78+
regenerateDevCerts = let
79+
moddedConfig = pkgs.writeText "launcher-config.yaml" (builtins.toJSON (
80+
daedalusPkgs.launcherConfigs.launcherConfig
81+
// {
82+
daedalusBin = "true";
83+
}
84+
));
85+
in
86+
pkgs.writeShellScriptBin "regenerate-dev-certs" ''
87+
${daedalusPkgs.daedalus-bridge}/bin/cardano-launcher --config ${moddedConfig}
88+
'';
7889
gcRoot = pkgs.runCommandLocal "gc-root" {
7990
properBuildShell = buildShell.overrideAttrs (old: { buildCommand = "export >$out"; });
8091
cardanoWalletsHaskellNix = daedalusPkgs.walletFlake.outputs.legacyPackages.${system}.roots;
@@ -182,6 +193,17 @@ let
182193
183194
echo 'jq < $LAUNCHER_CONFIG'
184195
echo debug the node by running debug-node
196+
197+
echo 'Resolving environment variables to absolute paths…'
198+
# XXX: they originally contain references to HOME or XDG_DATA_HOME in launcher-config.yaml:
199+
export CARDANO_WALLET_TLS_PATH="${daedalusPkgs.launcherConfigs.launcherConfig.tlsPath}"
200+
201+
echo 'Re-generating dev certificates for ‘cardano-wallet’…'
202+
mkdir -p "$CARDANO_WALLET_TLS_PATH"
203+
regenerate-dev-certs >/dev/null
204+
205+
echo
206+
echo 'Now, run ‘yarn dev’.'
185207
'';
186208
});
187209
daedalus = daedalusShell.overrideAttrs (oldAttrs: {

source/main/cardano/CardanoWalletLauncher.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,6 @@ export async function CardanoWalletLauncher(
8383
svCert: path.join(tlsPath, 'server/server.crt'),
8484
svKey: path.join(tlsPath, 'server/server.key'),
8585
};
86-
// Prepare development TLS files
87-
const { isProduction } = environment;
88-
89-
if (
90-
!isProduction &&
91-
nodeImplementation === CardanoNodeImplementationOptions.CARDANO
92-
) {
93-
await fs.copy('tls', tlsPath);
94-
}
9586

9687
let tokenMetadataServer;
9788
// This switch statement handles any node specific

tls/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

tls/client/ca.crt

Lines changed: 0 additions & 20 deletions
This file was deleted.

tls/client/client.crt

Lines changed: 0 additions & 20 deletions
This file was deleted.

tls/client/client.key

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)