Merge branch 'main' into develop

Author: michalrus

CHANGELOG.md

@@ -2,17 +2,21 @@
 
 ## vNext
 
+## 7.0.0
+
 ### Features
 
 - Added Cardano governance voting tab ([PR 3240](https://github.com/input-output-hk/daedalus/pull/3240))
 
 ### Chores
 
-- Update `cardano-node` to 10.1.2 via `cardano-wallet` v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))
+- Update `cardano-node` to 10.1.3 ([PR 3249](https://github.com/input-output-hk/daedalus/pull/3249))
+
+- Update `cardano-wallet` to v2024-11-18 ([PR 3229](https://github.com/input-output-hk/daedalus/pull/3229))
 
 ### Fixes
 
-- 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)
+- 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))
 
 ## 6.0.2
 

flake.lock

@@ -5,6 +5,8 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
     cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-11-18";
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
+    cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.3";
+    cardano-node-override.flake = false;
     cardano-playground.url = "github:input-output-hk/cardano-playground/49d93e5fe42e1e37f8b4c7d463b5d6bc4af65f26";
     cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
     cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";

flake.nix

@@ -40,7 +40,7 @@ rec {
   }).defaultNix;
 
   nodeFlake = let
-    unpatched = walletFlake.inputs.cardano-node-runtime;
+    unpatched = inputs.cardano-node-override;
   in (flake-compat {
     src = {
       outPath = toString (pkgs.runCommand "source" {} ''

nix/internal/common.nix

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -197,6 +197,7 @@
   },
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "7.1.3",
+    "@cardano-sdk/core": "^0.41.4",
     "@iohk-jormungandr/wallet-js": "0.5.0-pre7",
     "@ledgerhq/hw-transport-node-hid": "6.27.15",
     "@trezor/connect": "9.3.0",
@@ -315,5 +316,6 @@
     "**/**/nan": "^2.17.0",
     "prebuild-install": "^6.1.4",
     "pbkdf2": "3.1.2"
-  }
+  },
+  "packageManager": "[email protected]+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

package.json

@@ -1019,6 +1019,8 @@ export default class AdaApi {
         .set('conwayWalletNotDelegatedToDRep')
         .where('code', 'created_invalid_transaction')
         .inc('message', 'ConwayWdrlNotDelegatedToDRep')
+        .set('conwayWalletNotDelegatedToDRep')
+        .where('code', 'withdrawal_not_possible_without_vote')
         .set('transactionIsTooBig', true, {
           linkLabel: 'tooBigTransactionErrorLinkLabel',
           linkURL: 'tooBigTransactionErrorLinkURL',
@@ -1298,7 +1300,7 @@ export default class AdaApi {
         error,
       });
 
-      throw new ApiError(error);
+      throw new ApiError(error).result();
     }
   };
 
@@ -1316,7 +1318,13 @@ export default class AdaApi {
       logger.error('AdaApi::createExternalTransaction error', {
         error,
       });
-      throw new ApiError(error);
+
+      const apiError = new ApiError(error)
+        .set('conwayWalletNotDelegatedToDRep')
+        .where('code', 'created_invalid_transaction')
+        .inc('message', 'ConwayWdrlNotDelegatedToDRep');
+
+      throw apiError.result();
     }
   };
   inspectAddress = async (request: {
@@ -2825,7 +2833,7 @@ export default class AdaApi {
         error,
       });
 
-      throw new ApiError(error);
+      throw new ApiError(error).result();
     }
   };
 

source/common/utils/assertIsBech32WithPrefix.ts

@@ -7,8 +7,6 @@
   flex: 1;
   flex-direction: column;
   justify-content: center;
-  margin-bottom: -40px;
-  padding: 20px;
   text-align: center;
 
   h1 {

source/renderer/app/api/api.ts

@@ -4,12 +4,12 @@ export const messages = defineMessages({
   drepInputLabel: {
     id: 'voting.governance.drepInputLabel',
     defaultMessage:
-      '!!!Please type or paste a valid DRep ID here. Look up {drepDirectoryLink}',
+      '!!!Please type or paste a valid DRep ID (CIP-105) here. Look up {drepDirectoryLink}',
     description: 'Label for DRep input on the governance page',
   },
   drepInputLabelPreprod: {
     id: 'voting.governance.drepInputLabelPreprod',
-    defaultMessage: '!!!Please type or paste a valid DRep ID here.',
+    defaultMessage: '!!!Please type or paste a valid DRep ID (CIP-105) here.',
     description: 'Label for DRep input on the governance page for preprod',
   },
   drepInputLabelLinkText: {

source/renderer/app/components/voting/VotingUnavailable.scss

@@ -16,6 +16,16 @@
   text-transform: uppercase;
 }
 
+span.link {
+  font-size: inherit;
+  line-height: inherit;
+  opacity: 0.7;
+
+  &:hover {
+    opacity: 1;
+  }
+}
+
 .info {
   @extend %regularText;
   p {