Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
30c3ac8
[DDW-1220] Update cardano-node to 8.1.1 (via cardano-wallet)
michalrus Aug 11, 2023
39c9a60
Merge branch 'develop' into chore/ddw-1220-cardano-node-8.1.1
michalrus Aug 16, 2023
a7e722d
[DDW-1228] Update cardano-node to 8.7.3 (via cardano-wallet)
michalrus Jan 18, 2024
5aa1fb7
[DDW-1228] Fix `selfnode`
michalrus Jan 19, 2024
7cb4334
[DDW-1228] Use P2P configs from `cardano-playground`
michalrus Jan 19, 2024
30c78eb
[DDW-1228] Don’t force-bind the node to localhost
michalrus Jan 22, 2024
ecc4e37
Merge branch 'develop' into chore/ddw-1228-cardano-node-8.7.3
michalrus Jan 22, 2024
c531317
[DDW-1228] Update CHANGELOG.md
michalrus Jan 22, 2024
2649489
[DDW-1228] Prepend `cardano-node` to `PATH`, not append
michalrus Feb 26, 2024
dcef2fc
[LW-9778, DDW-1228] Update cardano-wallet to v2024-03-01
michalrus Mar 5, 2024
804b9f4
fix devshell errors
disassembler Mar 25, 2024
72f79e2
[LW-9778, DDW-1228] Update `cardano-node` to 8.9.1
michalrus Mar 26, 2024
ec0aad5
[LW-9778, DDW-1228] Fix the Windows installer
michalrus Mar 26, 2024
247787d
[LW-9778, DDW-1228] Use the newest `cardano-wallet` PR
michalrus Mar 26, 2024
a515895
Expose `native-modules.zip` for Windows development & debugging
michalrus Mar 27, 2024
bc88c8b
[LW-9778, DDW-1228] Abstract `common.temporaryNodeModulesPatches`
michalrus Mar 27, 2024
2bbf573
[LW-9778, DDW-1228] Add `-N` to the RTS opts of both node and wallet
michalrus Mar 27, 2024
2c28265
[LW-9778, DDW-1228] Update `cardano-wallet` to v2024-03-27
michalrus Mar 28, 2024
2f43e4e
[LW-9778, DDW-1228] Update `Changelog.md` for the merge
michalrus Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Fixed out-of-memory errors on https://ci.iog.io ([PR 3145](https://github.com/input-output-hk/daedalus/pull/3145))

### Chores

- Updated cardano-node to 8.7.3 (via cardano-wallet) ([PR 3152](https://github.com/input-output-hk/daedalus/pull/3152))

## 5.3.0

### Features
Expand Down
47 changes: 23 additions & 24 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
cardano-wallet-unpatched.url = "github:input-output-hk/cardano-wallet/v2023-04-14";
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/rc-latest";
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
cardano-world.url = "github:input-output-hk/cardano-world/a0a315100ee320395be97fcc83f46678d5a7fb6e";
cardano-world.flake = false; # otherwise, +19k quadratic dependencies in flake.lock…
cardano-playground.url = "github:input-output-hk/cardano-playground";
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
cardano-shell.flake = false;
tullia.url = "github:input-output-hk/tullia";
Expand Down
5 changes: 2 additions & 3 deletions installers/common/MacInstaller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -365,16 +365,15 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
cp f (dataDir </> f)
when (oCluster /= Selfnode) $ do
forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json" ] $ \f ->
forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "genesis-conway.json" ] $ \f ->
cp f (dataDir </> f)

when (oCluster == Selfnode) $ do
cp "signing.key" (dataDir </> "signing.key")
cp "delegation.cert" (dataDir </> "delegation.cert")
cp (bridge </> "bin" </> "mock-token-metadata-server") (dir </> "mock-token-metadata-server")
cp (bridge </> "bin" </> "token-metadata.json") (dataDir </> "token-metadata.json")
cp (bridge </> "bin" </> "local-cluster--unwrapped") (dir </> "local-cluster")
cptreeL (bridge </> "bin" </> "test" </> "data") (dataDir </> "data")
cp (bridge </> "bin" </> "local-cluster") (dir </> "local-cluster")

procs "chmod" ["-R", "+w", tt dir] empty

Expand Down
5 changes: 2 additions & 3 deletions installers/common/WindowsInstaller.hs
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
file [] "topology.yaml"
file [] "genesis.json"
when (clusterName /= Selfnode) $ do
file [] "genesis-conway.json"
file [] "genesis-byron.json"
file [] "genesis-shelley.json"
file [] "genesis-alonzo.json"
file [] "libsodium-23.dll"
file [] "libsecp256k1-1.dll"
file [] "libsecp256k1-0.dll"
file [] "libsecp256k1-2.dll"
file [] "libssl-3-x64.dll"
file [] "libcrypto-3-x64.dll"
when (clusterName == Selfnode) $ do
Expand All @@ -240,7 +240,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
file [] "libgmpxx-4.dll"
file [] "libwinpthread-1.dll"
file [] "mock-token-metadata-server.exe"
file [Recursive] "test\\"
file [] "token-metadata.json"
file [] "cardano-launcher.exe"
file [] "libffi-8.dll"
Expand Down
2 changes: 2 additions & 0 deletions nix/devshells.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ let
mkdir -p "$CARDANO_WALLET_TLS_PATH"
regenerate-dev-certs >/dev/null

sed -r "s/'127\.0\.0\.1'/undefined/g" -i node_modules/cardano-launcher/dist/src/cardanoNode.js

echo
echo 'Now, run ‘yarn dev’.'
'';
Expand Down
4 changes: 3 additions & 1 deletion nix/internal/any-darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ let
in rec {

inherit common;
inherit (common) nodejs nodePackages yarn yarn2nix offlineCache srcLockfiles srcWithoutNix;
inherit (common) nodejs yarn yarn2nix offlineCache srcLockfiles srcWithoutNix;

# The following is used in all `configurePhase`s:
darwinSpecificCaches = let
Expand Down Expand Up @@ -137,6 +137,8 @@ in rec {
patchShebangs .
sed -r 's#.*patchElectronRebuild.*#${common.patchElectronRebuild}/bin/*#' -i scripts/rebuild-native-modules.sh

sed -r "s/'127\.0\.0\.1'/undefined/g" -i node_modules/cardano-launcher/dist/src/cardanoNode.js

export DEVX_FIXME_DONT_YARN_INSTALL=1
(
cd installers/
Expand Down
7 changes: 0 additions & 7 deletions nix/internal/cardano-bridge.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,8 @@ runCommandCC "daedalus-cardano-bridge" {
cp -f ${local-cluster}/bin/local-cluster .

'' else if target == "x86_64-darwin" || target == "aarch64-darwin" then ''
# For nix-shell:
cp -f ${local-cluster}/bin/local-cluster .

# For selfnode installer:
cp -f ${local-cluster}/bin/.local-cluster-wrapped local-cluster--unwrapped
mkdir -p test/data
test_data_dir=$(cat local-cluster | grep -oP "SHELLEY_TEST_DATA='\K[^']+")
cp -rf $test_data_dir test/data/

'' else abort "Unknown target: ${target}"}

cp -f ${mock-token-metadata-server}/bin/* . || true
Expand Down
36 changes: 32 additions & 4 deletions nix/internal/cardano-wallet--enable-aarch64-darwin.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
diff --git a/flake.nix b/flake.nix
index eba0a14512..e05d417f81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -196,8 +196,22 @@
collectChecks
check;

- nodePkgs = cardano-node-runtime.legacyPackages.${system};
- nodeProject = cardano-node-runtime.project.${system};
+ cardano-node-runtime-patched =
+ if system != "aarch64-darwin"
+ then cardano-node-runtime
+ else (import ./nix/flake-compat.nix {
+ src = {
+ outPath = toString (pkgs.runCommandLocal "patched-cardano-node" {} ''
+ cp -r ${cardano-node-runtime} $out
+ chmod -R +w $out
+ cat ${./nix/supported-systems.nix} >$out/nix/supported-systems.nix
+ '');
+ inherit (cardano-node-runtime.sourceInfo) rev shortRev lastModified lastModifiedDate;
+ };
+ }).defaultNix;
+
+ nodePkgs = cardano-node-runtime-patched.legacyPackages.${system};
+ nodeProject = cardano-node-runtime-patched.project.${system};

walletProject = (import ./nix/haskell.nix
CHaP
diff --git a/nix/supported-systems.nix b/nix/supported-systems.nix
index 6e3f0d94e3..5de7138b32 100644
index 6e3f0d94e3..a0c0ae17dc 100644
--- a/nix/supported-systems.nix
+++ b/nix/supported-systems.nix
@@ -1,6 +1,5 @@
[
@@ -2,5 +2,5 @@
"x86_64-linux"
"x86_64-darwin"
- # TODO: Enable aarch64-darwin when there are Hydra builders for it
# TODO: Enable aarch64-darwin when there are Hydra builders for it
- # "aarch64-darwin"
+ "aarch64-darwin"
]
10 changes: 5 additions & 5 deletions nix/internal/cardano-wallet--expose-windowsPackages.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/flake.nix b/flake.nix
index af206a740e..ef05414b85 100644
index e05d417f81..a985140f89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -432,6 +432,7 @@
nixosTests = import ./nix/nixos/tests {
inherit pkgs project;
@@ -420,6 +420,7 @@
inherit pkgs;
project = walletProject;
};
+ windowsPackages = mkPackages project.projectCross.mingwW64;
+ windowsPackages = mkPackages walletProject.projectCross.mingwW64;
}) // {
# Continuous integration builds
ci.tests.all = pkgs.releaseTools.aggregate {
45 changes: 0 additions & 45 deletions nix/internal/cardano-wallet--proper-runtimeNodePkgs.patch

This file was deleted.

Loading