Skip to content

Commit 3b40f0a

Browse files
author
Lucas Araujo
committed
Merge branch 'develop' into fix/ddw-923-stake-pool-list-table-view-adjustments
2 parents 6ed7106 + 76cf83d commit 3b40f0a

File tree

80 files changed

+1607
-1895
lines changed

Some content is hidden

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

80 files changed

+1607
-1895
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,32 @@
44

55
### Features
66

7+
- Improved UI regarding the Hardware Wallet public key export error ([PR 2922](https://github.com/input-output-hk/daedalus/pull/2922))
8+
- Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))
9+
- Improved IPC by reducing the amount of messages from periodic events ([PR 2892](https://github.com/input-output-hk/daedalus/pull/2892))
710
- Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
811
- Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
912

1013
### Fixes
1114

1215
- Fixed stake pool list styling ([PR 2920](https://github.com/input-output-hk/daedalus/pull/2920))
16+
- Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))
17+
- Fixed performance issue on stake pool list view ([PR 2924](https://github.com/input-output-hk/daedalus/pull/2924))
18+
- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
19+
- Fixed position of popup on syncing screen ([PR 2921](https://github.com/input-output-hk/daedalus/pull/2921))
20+
- Fixed issue with missing character when copying address from PDF ([PR 2925](https://github.com/input-output-hk/daedalus/pull/2925))
21+
- Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
22+
- Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
1323
- Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
1424
- Fix warning sign displayed when recommend decimals is zero ([PR 2905](https://github.com/input-output-hk/daedalus/pull/2905))
1525
- Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))
1626
- Sets minimum transaction fee to ada input field when tokens are removed ([PR 2918](https://github.com/input-output-hk/daedalus/pull/2918))
1727

1828
### Chores
1929

30+
- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930))
31+
- Using new faker.js ([PR 2855](https://github.com/input-output-hk/daedalus/pull/2855))
32+
- Removed `dockutil` due compatibility issues with MacOs Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
2033
- Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
2134
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
2235
- Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))

README.md

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88

99
Daedalus - Cryptocurrency Wallet
1010

11-
## Installation
11+
## Setup development environment
1212

13-
### Yarn
13+
### Linux/macOS
14+
15+
#### Yarn
1416

1517
[Yarn](https://yarnpkg.com/lang/en/docs/install) is required to install `npm` dependencies to build Daedalus.
1618

17-
### Nix
19+
#### Nix
1820

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

@@ -57,21 +59,19 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
5759
```
5860
2. Download certificate from https://docs.certifytheweb.com/docs/kb/kb-202109-letsencrypt/ and import to your keychain.
5961

60-
## Development
61-
62-
### Running Daedalus with Cardano Node
62+
#### Running Daedalus with Cardano Node
6363

64-
#### Selfnode
64+
##### Selfnode
6565

6666
1. Run `yarn nix:selfnode` from `daedalus`.
6767
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`)
6868
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:
69-
- Byron wallets: `yarn byron:wallet:importer`
70-
- Shelley wallets: `yarn shelley:wallet:importer`
71-
- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
72-
- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
73-
- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
74-
- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
69+
- Byron wallets: `yarn byron:wallet:importer`
70+
- Shelley wallets: `yarn shelley:wallet:importer`
71+
- Mary wallets: `yarn mary:wallet:importer` (all of which contain native tokens which are visible once selfnode enters Mary era)
72+
- Yoroi Byron wallets: `yarn yoroi:wallet:importer`
73+
- _ITN Byron wallets:_ `yarn itn:byron:wallet:importer` **[Deprecated]**
74+
- _ITN Shelley wallets:_ `yarn itn:shelley:wallet:importer` **[Deprecated]**
7575

7676
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`).
7777

@@ -90,37 +90,37 @@ If you get SSL error when running `nix-shell` (SSL peer certificate or SSH remot
9090
| desiredPoolNumber | 3
9191
| minimumUtxoValue | 1 ADA
9292

93-
#### Mainnet
93+
##### Mainnet
9494

9595
1. Run `yarn nix:mainnet` from `daedalus`.
9696
2. Run `yarn dev` from the subsequent `nix-shell`
9797

98-
#### Flight
98+
##### Flight
9999

100100
1. Run `yarn nix:flight` from `daedalus`.
101101
2. Run `yarn dev` from the subsequent `nix-shell`
102102

103-
#### Testnet
103+
##### Testnet
104104

105105
1. Run `yarn nix:testnet` from `daedalus`.
106106
2. Run `yarn dev` from the subsequent `nix-shell`
107107

108-
#### Staging
108+
##### Staging
109109

110110
1. Run `yarn nix:staging` from `daedalus`.
111111
2. Run `yarn dev` from the subsequent `nix-shell`
112112

113-
#### Shelley QA
113+
##### Shelley QA
114114

115115
1. Run `yarn nix:shelley_qa` from `daedalus`.
116116
2. Run `yarn dev` from the subsequent `nix-shell`
117117

118-
#### Alonzo Purple
118+
##### Alonzo Purple
119119

120120
1. Run `yarn nix:alonzo_purple` from `daedalus`.
121121
2. Run `yarn dev` from the subsequent `nix-shell`
122122

123-
#### Native token metadata server
123+
##### Native token metadata server
124124

125125
Daedalus, by default, uses the following metadata server for all networks except for the mainnet: `https://metadata.cardano-testnet.iohkdev.io/`.
126126

@@ -151,7 +151,28 @@ http://localhost:65432/metadata/query
151151
```
152152
... and expect a "200 OK" response.
153153

154-
### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
154+
### Windows
155+
156+
This option is only for troubleshooting windows specific issues with hardware wallets. It is not recommended to use Windows as a developer environment.
157+
Most of the commands need `nix` and will run only on Linux or macOS.
158+
159+
#### Requisites
160+
- Windows 10/11
161+
- Daedalus testnet installation (similar version used in branch) in `C:\Program Files\Daedalus Testnet`
162+
- NodeJS 16
163+
- Python2 *
164+
- `yarn global add windows-build-tools` * (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder)
165+
- Microsoft Build Tools 2015 *
166+
- Microsoft Visual Studio 2017 (Include Desktop development with C++) *
167+
- `yarn config set msvsversion 2015 --global`
168+
169+
*needed for compiling [email protected] on Windows
170+
171+
#### Steps
172+
- `yarn install`
173+
- `yarn dev:windows`
174+
175+
#### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
155176

156177
`Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`.
157178

107 KB
Binary file not shown.

installers/common/MacInstaller.hs

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -177,27 +177,6 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
177177
</dict>
178178
</plist>|]
179179

180-
makePostInstall :: Format a (Text -> a)
181-
makePostInstall = "#!/usr/bin/env bash\n" %
182-
"#\n" %
183-
"# See /var/log/install.log to debug this\n" %
184-
"\n" %
185-
"src_pkg=\"$1\"\ndst_root=\"$2\"\ndst_mount=\"$3\"\nsys_root=\"$4\"\n" %
186-
"./dockutil --add \"${dst_root}/" % s % "\" --allhomes\n"
187-
188-
makeScriptsDir :: Options -> DarwinConfig -> Managed T.Text
189-
makeScriptsDir Options{oBackend} DarwinConfig{dcAppNameApp} = case oBackend of
190-
Cardano _ -> common
191-
where
192-
common = do
193-
tmp <- fromString <$> (liftIO $ getEnv "TMP")
194-
tempdir <- mktempdir tmp "scripts"
195-
liftIO $ do
196-
cp "data/scripts/dockutil" (tempdir </> "dockutil")
197-
writeTextFile (tempdir </> "postinstall") (format makePostInstall dcAppNameApp)
198-
chmod executable (tempdir </> "postinstall")
199-
pure $ tt tempdir
200-
201180
makeSigningDir :: Managed (T.Text, T.Text)
202181
makeSigningDir = do
203182
tmp <- fromString <$> (liftIO $ getEnv "TMP")
@@ -245,6 +224,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
245224
, "bip66"
246225
, "bitcoin-ops"
247226
, "blake2b"
227+
, "blake2"
248228
, "blake-hash"
249229
, "blake2b-wasm"
250230
, "bn.js"
@@ -389,27 +369,21 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
389369
exit $ ExitFailure 1
390370

391371
makeInstaller :: Options -> DarwinConfig -> FilePath -> FilePath -> IO FilePath
392-
makeInstaller opts@Options{oOutputDir} darwinConfig@DarwinConfig{dcPkgName} componentRoot pkg = do
372+
makeInstaller Options{oOutputDir} DarwinConfig{dcPkgName} componentRoot pkg = do
393373
echo "Making installer ..."
394-
let tempPkg1 = format fp (oOutputDir </> pkg)
395-
tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
374+
let
375+
tempPkg1 = format fp (oOutputDir </> pkg)
376+
tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
377+
pkgargs :: [ T.Text ]
378+
pkgargs =
379+
[ "--identifier", dcPkgName
380+
, "--component", tt componentRoot
381+
, "--install-location", "/Applications"
382+
, tempPkg1
383+
]
396384

397385
mktree oOutputDir
398-
with (makeScriptsDir opts darwinConfig) $ \scriptsDir -> do
399-
let
400-
pkgargs :: [ T.Text ]
401-
pkgargs =
402-
[ "--identifier"
403-
, dcPkgName
404-
, "--scripts", scriptsDir
405-
, "--component"
406-
, tt componentRoot
407-
, "--install-location"
408-
, "/Applications"
409-
, tempPkg1
410-
]
411-
run "ls" [ "-ltrh", scriptsDir ]
412-
run "pkgbuild" pkgargs
386+
run "pkgbuild" pkgargs
413387

414388
run "productbuild" [ "--product", "data/plist"
415389
, "--package", tempPkg1

0 commit comments

Comments
 (0)