Skip to content

Commit 0d2b3d0

Browse files
committed
Updated maintainer, removed hydra ci, and added settings depending on the environment
1 parent 80768a5 commit 0d2b3d0

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

README.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<blockquote>
2-
<sub>Document maintainer: Nikola Glumac<br/>Document status: Active</sub>
2+
<sub>Document maintainer: Daniel Main<br/>Document status: Active</sub>
33
</blockquote>
44

55
# Daedalus
@@ -20,7 +20,7 @@ Daedalus - Cryptocurrency Wallet
2020

2121
[Nix](https://nixos.org/nix/) is needed to run Daedalus in `nix-shell`.
2222

23-
1. Install nix: `curl -L https://nixos.org/nix/install | sh` (use `sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume` on macOS Catalina)
23+
1. Install nix: `curl -L https://nixos.org/nix/install | sh` (use `sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume` on macOS 10.15 and higher)
2424
2. Employ the signed IOHK binary cache:
2525
```bash
2626
$ sudo mkdir -p /etc/nix
@@ -40,10 +40,16 @@ Daedalus - Cryptocurrency Wallet
4040
4141
substituters = https://cache.iog.io https://cache.nixos.org/
4242
trusted-substituters =
43-
trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
43+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
44+
45+
# Only if using mac
4446
extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
47+
4548
experimental-features = nix-command flakes
4649
50+
# If you are running on Linux x86/64
51+
system = x86_64-linux
52+
4753
# If you are running on a Mac with Intel chip
4854
system = x86_64-darwin
4955
@@ -70,16 +76,16 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
7076
1. Run `yarn nix:selfnode` from `daedalus`.
7177
2. Run `yarn dev` from the subsequent `nix-shell` (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`)
7278
3. Once Daedalus has started and has gotten past the loading screen run the following commands from a new terminal window if you wish to import funded wallets:
73-
- Byron wallets: `yarn byron:wallet:importer`
74-
- Shelley wallets: `yarn shelley:wallet:importer`
75-
- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
76-
- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
77-
- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
78-
- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
79+
- Byron wallets: `yarn byron:wallet:importer`
80+
- Shelley wallets: `yarn shelley:wallet:importer`
81+
- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
82+
- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
83+
- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
84+
- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
7985

80-
These scripts import 3 wallets by default. You can import up to 10 wallets by supplying `WALLET_COUNT` environment variable (e.g. `WALLET_COUNT=10 yarn mary:wallet:importer`).
86+
These scripts import 3 wallets by default. You can import up to 10 wallets by supplying `WALLET_COUNT` environment variable (e.g. `WALLET_COUNT=10 yarn mary:wallet:importer`).
8187

82-
List of all funded wallet recovery phrases can be found here: https://github.com/input-output-hk/daedalus/blob/develop/utils/api-importer/mnemonics.js
88+
List of all funded wallet recovery phrases can be found here: https://github.com/input-output-hk/daedalus/blob/develop/utils/api-importer/mnemonics.js
8389

8490
**Notes:**
8591
- Cardano wallet process ID shown on the "Diagnostics" screen is faked and expected to match the Cardano node process ID.

0 commit comments

Comments
 (0)