Merge branch 'release/7.0.0' into fix/lw-11919-voting-power-delegatio…

…n-from-HW-wallet-not-fully-synced
input-output-hk · Dec 2, 2024 · c744bf9 · c744bf9
2 parents 15a3f08 + d5f7e32
commit c744bf9
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,9 @@
 
 ### 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
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -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";

diff --git a/nix/internal/common.nix b/nix/internal/common.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" {} ''

diff --git a/source/renderer/app/api/api.ts b/source/renderer/app/api/api.ts
@@ -1300,7 +1300,7 @@ export default class AdaApi {
         error,
       });
 
-      throw new ApiError(error);
+      throw new ApiError(error).result();
     }
   };
 
@@ -1318,7 +1318,7 @@ export default class AdaApi {
       logger.error('AdaApi::createExternalTransaction error', {
         error,
       });
-      throw new ApiError(error);
+      throw new ApiError(error).result();
     }
   };
   inspectAddress = async (request: {
@@ -2827,7 +2827,7 @@ export default class AdaApi {
         error,
       });
 
-      throw new ApiError(error);
+      throw new ApiError(error).result();
     }
   };
 

diff --git a/source/renderer/app/stores/VotingStore.ts b/source/renderer/app/stores/VotingStore.ts
@@ -1,6 +1,5 @@
 import { action, computed, observable, runInAction } from 'mobx';
 import { get } from 'lodash';
-import BigNumber from 'bignumber.js';
 import Store from './lib/Store';
 import Request from './lib/LocalizedRequest';
 import { ROUTES } from '../routes-config';
@@ -30,8 +29,8 @@ import { EventCategories } from '../analytics';
 import type { DelegationCalculateFeeResponse } from '../api/staking/types';
 import Wallet from '../domains/Wallet';
 import ApiError from '../domains/ApiError';
-import type { DelegationAction } from '../types/stakingTypes';
 import { GenericApiError } from '../api/common/errors';
+import { logger } from '../utils/logging';
 
 export type VotingRegistrationKeyType = {
   bytes: (...args: Array<any>) => any;
@@ -280,29 +279,25 @@ export default class VotingStore extends Store {
     wallet: Wallet;
   }) => {
     if (wallet.isHardwareWallet) {
-      const [{ id: stakePoolId }] = this.stores.staking.stakePools;
-      let dlegationData: {
-        delegationAction: DelegationAction;
-        poolId: string;
-      } = {
-        delegationAction: 'join',
-        poolId: stakePoolId,
-      };
+      let poolId: string;
 
       if (wallet.isDelegating) {
         const { lastDelegatedStakePoolId, delegatedStakePoolId } = wallet;
-        const poolId = lastDelegatedStakePoolId || delegatedStakePoolId || '';
-        dlegationData = {
-          delegationAction: 'quit',
-          poolId,
-        };
+        const currentPoolId = lastDelegatedStakePoolId || delegatedStakePoolId;
+        poolId = this.stores.staking.stakePools.find(
+          (stakePool) => stakePool.id !== currentPoolId
+        ).id;
+      } else {
+        const [{ id }] = this.stores.staking.stakePools;
+        poolId = id;
       }
 
       try {
         const initialCoinSelection = await this.stores.hardwareWallets.selectDelegationCoins(
           {
             walletId: wallet.id,
-            ...dlegationData,
+            delegationAction: 'join',
+            poolId,
           }
         );
 
@@ -342,6 +337,12 @@ export default class VotingStore extends Store {
           fees: coinSelection.fee,
         };
       } catch (error) {
+        logger.error(
+          'VotingStore: error while initializing VP delegation TX with HW',
+          {
+            error,
+          }
+        );
         return {
           success: false,
           errorCode: parseApiCode(
@@ -364,6 +365,9 @@ export default class VotingStore extends Store {
         fees: constructedTx.fee,
       };
     } catch (error) {
+      logger.error('VotingStore: error while initializing VP delegation TX', {
+        error,
+      });
       return {
         success: false,
         errorCode: parseApiCode(expectedInitializeVPDelegationTxErrors, error),
@@ -417,6 +421,9 @@ export default class VotingStore extends Store {
           success: true,
         };
       } catch (error) {
+        logger.error('VotingStore: error while delegating vote with HW', {
+          error,
+        });
         const errorCode: GenericErrorCode = 'generic';
         return {
           success: false,