Skip to content

Commit d68a081

Browse files
authored
Merge pull request #3244 from input-output-hk/release/7.0.0
Release/7.0.0
2 parents cf020c5 + 15d1f08 commit d68a081

Some content is hidden

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

58 files changed

+3646
-213
lines changed

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## 7.0.0
4+
5+
### Features
6+
7+
- Added Cardano governance voting tab ([PR 3240](https://github.com/input-output-hk/daedalus/pull/3240))
8+
9+
### Chores
10+
11+
- Update `cardano-node` to 10.1.3 ([PR 3249](https://github.com/input-output-hk/daedalus/pull/3249))
12+
13+
- Update `cardano-wallet` to v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))
14+
15+
### Fixes
16+
17+
- Handle createTransaction error when Conway era wallet has staking rewards but has not participated in governance yet ([PR 3237](https://github.com/input-output-hk/daedalus/pull/3237))
18+
319
## 6.0.2
420

521
### Fixes

README.md

+22-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ Daedalus - Cryptocurrency Wallet
2020

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

23-
1. Install nix: `sh <(curl -L https://nixos.org/nix/install)`
23+
1. Install nix using [Determinate Nix Installer](https://github.com/DeterminateSystems/nix-installer)
24+
```
25+
$ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | \
26+
sh -s -- install
27+
```
2428
2. Employ the signed IOHK binary cache:
2529
```bash
2630
$ sudo mkdir -p /etc/nix
@@ -37,8 +41,22 @@ Daedalus - Cryptocurrency Wallet
3741
# If you are running on a Mac with Apple Silicon chip, but want to also build for Intel:
3842
extra-platforms = x86_64-darwin aarch64-darwin
3943
```
40-
41-
3. Run `nix develop` with a correct argument or by using existing `package.json` scripts to load a shell with all the correct versions of all the required dependencies for development, e.g.:
44+
45+
3. Are you a MacOS user? Reload nix-daemon.
46+
1. Stop the daemon
47+
```bash
48+
sudo launchctl remove org.nixos.nix-daemon
49+
```
50+
2. Verify it's not running (only grep process should be listed)
51+
```bash
52+
ps aux | grep nix-daemon
53+
```
54+
3. Start the daemon
55+
```bash
56+
sudo launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist
57+
```
58+
59+
4. Run `nix develop` with a correct argument or by using existing `package.json` scripts to load a shell with all the correct versions of all the required dependencies for development, e.g.:
4260
* `nix develop -L .#mainnet`
4361
* … which is equivalent to `yarn nix:mainnet`
4462
@@ -68,7 +86,7 @@ If you get SSL error when running `nix develop` (SSL peer certificate or SSH rem
6886
6987
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`).
7088
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
89+
List of all funded wallet recovery phrases can be found here: https://github.com/input-output-hk/daedalus/blob/develop/utils/api-importer/mnemonics.ts
7290
7391
**Notes:**
7492
- Cardano wallet process ID shown on the "Diagnostics" screen is faked and expected to match the Cardano node process ID.

flake.lock

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
inputs = {
55
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
6-
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27";
6+
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-11-18";
77
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
8-
cardano-node-override.url = "github:IntersectMBO/cardano-node/9.1.1";
8+
cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.3";
99
cardano-node-override.flake = false;
10-
cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24";
10+
cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26";
1111
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
1212
cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
1313
cardano-shell.flake = false;

installers/common/WindowsInstaller.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
231231
file [] "genesis-alonzo.json"
232232
file [] "libsodium-23.dll"
233233
file [] "libsecp256k1-2.dll"
234-
file [] "libssl-3-x64.dll"
235-
file [] "libcrypto-3-x64.dll"
236234
when (clusterName == Selfnode) $ do
237235
file [] "signing.key"
238236
file [] "delegation.cert"
@@ -242,10 +240,14 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
242240
file [] "mock-token-metadata-server.exe"
243241
file [] "token-metadata.json"
244242
file [] "cardano-launcher.exe"
243+
file [] "libatomic-1.dll"
245244
file [] "libffi-8.dll"
246245
file [] "libgmp-10.dll"
247246
file [] "libstdc++-6.dll"
248247
file [] "mcfgthread-12.dll"
248+
file [] "libmcfgthread-1.dll"
249+
file [] "libquadmath-0.dll"
250+
file [] "libssp-0.dll"
249251
file [] "libgcc_s_seh-1.dll"
250252
file [] "zlib1.dll"
251253
--file [] "cardano-x509-certificates.exe"

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "daedalus",
33
"productName": "Daedalus",
4-
"version": "6.0.2",
4+
"version": "7.0.0",
55
"description": "Cryptocurrency Wallet",
66
"main": "./dist/main/index.js",
77
"scripts": {
@@ -197,6 +197,7 @@
197197
},
198198
"dependencies": {
199199
"@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
200+
"@cardano-sdk/core": "^0.41.4",
200201
"@iohk-jormungandr/wallet-js": "0.5.0-pre7",
201202
"@ledgerhq/hw-transport-node-hid": "6.27.15",
202203
"@trezor/connect": "9.3.0",
@@ -315,5 +316,6 @@
315316
"**/**/nan": "^2.17.0",
316317
"prebuild-install": "^6.1.4",
317318
"pbkdf2": "3.1.2"
318-
}
319+
},
320+
"packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
319321
}

source/renderer/app/Routes.tsx

+16-5
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ import VotingRegistrationPage from './containers/voting/VotingRegistrationPage';
3636
import { IS_STAKING_INFO_PAGE_AVAILABLE } from './config/stakingConfig';
3737
import AnalyticsConsentPage from './containers/profile/AnalyticsConsentPage';
3838
import TrackedRoute from './analytics/TrackedRoute';
39+
import Voting from './containers/voting/Voting';
40+
import VotingGovernancePage from './containers/voting/VotingGovernancePage';
3941

4042
export const Routes = withRouter(() => (
4143
<Route path={ROUTES.ROOT}>
@@ -205,11 +207,20 @@ export const Routes = withRouter(() => (
205207
component={RedeemItnRewardsContainer}
206208
/>
207209
</Route>
208-
<TrackedRoute
209-
pageTitle="Voting Registration"
210-
path={ROUTES.VOTING.REGISTRATION}
211-
component={VotingRegistrationPage}
212-
/>
210+
<Route path={ROUTES.VOTING.ROOT}>
211+
<Voting>
212+
<TrackedRoute
213+
pageTitle="Voting Registration"
214+
path={ROUTES.VOTING.REGISTRATION}
215+
component={VotingRegistrationPage}
216+
/>
217+
<TrackedRoute
218+
pageTitle="Voting Governance"
219+
path={ROUTES.VOTING.GOVERNANCE}
220+
component={VotingGovernancePage}
221+
/>
222+
</Voting>
223+
</Route>
213224
</Switch>
214225
</Root>
215226
</Route>

source/renderer/app/analytics/MatomoAnalyticsTracker.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ export class MatomoAnalyticsTracker implements AnalyticsTracker {
3434
return this.#analyticsClient.sendPageNavigationEvent(pageTitle);
3535
}
3636

37-
sendEvent(category: string, name: string, action?: string) {
38-
return this.#analyticsClient.sendEvent(category, name, action);
37+
sendEvent(category: string, name: string, action?: string, value?: number) {
38+
return this.#analyticsClient.sendEvent(category, name, action, value);
3939
}
4040

4141
async #enableTrackingIfAccepted() {

source/renderer/app/analytics/MatomoClient.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ export class MatomoClient implements AnalyticsClient {
4444
sendEvent = async (
4545
category: string,
4646
action: string,
47-
name?: string
47+
name?: string,
48+
value?: number
4849
): Promise<void> => {
4950
this.matomoTracker.track({
5051
_id: this.userId,
5152
ca: 1,
5253
e_c: category,
5354
e_a: action,
5455
e_n: name,
56+
e_v: value,
5557
url: this.getAnalyticsURL(),
5658
});
5759
};

source/renderer/app/analytics/types.ts

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
export interface AnalyticsClient {
22
sendPageNavigationEvent(pageTitle: string): Promise<void>;
3-
sendEvent(category: string, action: string, name?: string): Promise<void>;
3+
sendEvent(
4+
category: string,
5+
action: string,
6+
name?: string,
7+
value?: number
8+
): Promise<void>;
49
}
510

611
export enum AnalyticsAcceptanceStatus {
@@ -13,7 +18,12 @@ export interface AnalyticsTracker {
1318
enableTracking(): Promise<void>;
1419
disableTracking(): void;
1520
sendPageNavigationEvent(pageTitle: string): void;
16-
sendEvent(category: EventCategories, name: string, action?: string): void;
21+
sendEvent(
22+
category: EventCategories,
23+
name: string,
24+
action?: string,
25+
value?: number
26+
): void;
1727
}
1828

1929
export enum EventCategories {

0 commit comments

Comments
 (0)