Skip to content

Commit 2d78ebd

Browse files
committed
Merge branch 'develop' into chore/ddw-1083-flakes
2 parents b9d2ac9 + b584a26 commit 2d78ebd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1409
-559
lines changed

.buildkite/pipeline.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,25 @@ steps:
66

77
# XXX: `</dev/null turns off any interactive questions from Nix (e.g. accept-flake-config)
88

9+
- input: ':recycle: Trigger ‘x86_64-darwin’'
10+
key: 'trigger-x86_64-darwin'
11+
12+
- input: ':recycle: Trigger ‘aarch64-darwin’'
13+
key: 'trigger-aarch64-darwin'
14+
915
- label: 'daedalus-x86_64-darwin'
1016
command: 'nix </dev/null run --no-accept-flake-config -L .#packages.x86_64-darwin.buildkitePipeline'
17+
depends_on: 'trigger-x86_64-darwin'
1118
agents:
1219
queue: lace
1320
system: x86_64-darwin
1421

1522
- label: 'daedalus-aarch64-darwin'
1623
command: 'nix </dev/null run --no-accept-flake-config -L .#packages.aarch64-darwin.buildkitePipeline'
24+
depends_on: 'trigger-aarch64-darwin'
25+
env:
26+
# XXX: avoid Böhm GC segfaults in Nix on aarch64-darwin:
27+
GC_DONT_GC: 1
1728
agents:
1829
queue: lace
1930
system: aarch64-darwin

.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: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,27 @@
22

33
## vNext
44

5+
### Fixes
6+
7+
- Fixed decimals for syncing percentage ([PR 3106](https://github.com/input-output-hk/daedalus/pull/3106))
8+
9+
### Chores
10+
11+
- Switched Daedalus to be built with Nix flakes ([PR 3008](https://github.com/input-output-hk/daedalus/pull/3008))
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))
13+
- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `6.0.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3093))
14+
15+
## 5.2.0
16+
517
### Features
618

19+
- Added custom dimension to track legacy and hardware wallets ([PR 3091](https://github.com/input-output-hk/daedalus/pull/3091))
720
- Implemented CPU name grouping mechanism for analytics ([PR 3089](https://github.com/input-output-hk/daedalus/pull/3089))
821
- Implemented rounding RAM size in analytics ([PR 3088](https://github.com/input-output-hk/daedalus/pull/3088))
922

1023
### Chores
1124

12-
- Switched Daedalus to be built with Nix flakes ([PR 3008](https://github.com/input-output-hk/daedalus/pull/3008))
25+
- Update `cardano-node` to 1.35.4 for the Preview network respin ([PR 3082](https://github.com/input-output-hk/daedalus/pull/3082))
1326
- Updated new Catalyst API URL ([PR 3087](https://github.com/input-output-hk/daedalus/pull/3087))
1427
- Fixed Storybook state for General stories ([PR 3064](https://github.com/input-output-hk/daedalus/pull/3064))
1528

CODE-OF-CONDUCT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
See [Code of Conduct](https://github.com/input-output-hk/cardano-engineering-handbook/blob/main/CODE-OF-CONDUCT.md)

README.md

Lines changed: 9 additions & 9 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
@@ -59,16 +59,16 @@ If you get SSL error when running `nix develop` (SSL peer certificate or SSH rem
5959
1. Run `yarn nix:selfnode` from `daedalus`.
6060
2. Run `yarn dev` from the subsequent `nix develop` shell (use `KEEP_LOCAL_CLUSTER_RUNNING` environment variable to keep the local cluster running after Daedalus exits: `KEEP_LOCAL_CLUSTER_RUNNING=true yarn dev`)
6161
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:
62-
- Byron wallets: `yarn byron:wallet:importer`
63-
- Shelley wallets: `yarn shelley:wallet:importer`
64-
- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
65-
- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
66-
- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
67-
- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
62+
- Byron wallets: `yarn byron:wallet:importer`
63+
- Shelley wallets: `yarn shelley:wallet:importer`
64+
- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
65+
- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
66+
- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
67+
- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
6868

69-
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`).
69+
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`).
7070

71-
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
71+
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
7272

7373
**Notes:**
7474
- 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)