Merge pull request #3264 from input-output-hk/release/7.0.2

Release 7.0.2
input-output-hk · Dec 12, 2024 · d95a4cc · d95a4cc
2 parents a69826c + 331049f
commit d95a4cc
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,15 @@
 # Changelog
 
+## 7.0.2
+
+### Fixes
+
+- Changed Cardano Wallet endpoint used to initialize VP delegation transaction ([PR 3262](https://github.com/input-output-hk/daedalus/pull/3262))
+
 ## 7.0.1
 
+### Chores
+
 - Fixed crashing of Daedalus 7.0.0 on Ubuntu ([PR 3257](https://github.com/input-output-hk/daedalus/pull/3257))
 
 ## 7.0.0

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

diff --git a/source/renderer/app/api/api.ts b/source/renderer/app/api/api.ts
@@ -2829,7 +2829,7 @@ export default class AdaApi {
 
       return response;
     } catch (error) {
-      logger.debug('AdaApi::delegateVotes error', {
+      logger.error('AdaApi::delegateVotes error', {
         error,
       });
 

diff --git a/source/renderer/app/stores/VotingStore.ts b/source/renderer/app/stores/VotingStore.ts
@@ -278,29 +278,29 @@ export default class VotingStore extends Store {
     chosenOption: string;
     wallet: Wallet;
   }) => {
-    if (wallet.isHardwareWallet) {
-      let poolId: string;
-
-      if (wallet.isDelegating) {
-        const { lastDelegatedStakePoolId, delegatedStakePoolId } = wallet;
-        const currentPoolId = lastDelegatedStakePoolId || delegatedStakePoolId;
-        poolId = this.stores.staking.stakePools.find(
-          (stakePool) => stakePool.id !== currentPoolId
-        ).id;
-      } else {
-        const [{ id }] = this.stores.staking.stakePools;
-        poolId = id;
-      }
+    let poolId: string;
+
+    if (wallet.isDelegating) {
+      const { lastDelegatedStakePoolId, delegatedStakePoolId } = wallet;
+      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,
-            delegationAction: 'join',
-            poolId,
-          }
-        );
+    try {
+      let coinSelection = await this.stores.hardwareWallets.selectDelegationCoins(
+        {
+          walletId: wallet.id,
+          delegationAction: 'join',
+          poolId,
+        }
+      );
 
+      if (wallet.isHardwareWallet) {
         let certificates: object[] = [
           {
             certificateType: 'cast_vote',
@@ -309,7 +309,7 @@ export default class VotingStore extends Store {
           },
         ];
 
-        const walletNeedsRegisteringRewardAccount = initialCoinSelection.certificates.some(
+        const walletNeedsRegisteringRewardAccount = coinSelection.certificates.some(
           (c) => c.certificateType === 'register_reward_account'
         );
         if (walletNeedsRegisteringRewardAccount) {
@@ -322,52 +322,28 @@ export default class VotingStore extends Store {
           ];
         }
 
-        const coinSelection = {
-          ...initialCoinSelection,
+        coinSelection = {
+          ...coinSelection,
           certificates,
         };
 
         this.stores.hardwareWallets.updateTxSignRequest(coinSelection);
         this.stores.hardwareWallets.initiateTransaction({
           walletId: wallet.id,
         });
-
-        return {
-          success: true,
-          fees: coinSelection.fee,
-        };
-      } catch (error) {
-        logger.error(
-          'VotingStore: error while initializing VP delegation TX with HW',
-          {
-            error,
-          }
-        );
-        return {
-          success: false,
-          errorCode: parseApiCode(
-            expectedInitializeVPDelegationTxErrors,
-            error
-          ),
-        };
       }
-    }
-
-    this.constructTxRequest.reset();
-    try {
-      const constructedTx = await this.constructTxRequest.execute({
-        walletId: wallet.id,
-        data: { vote: chosenOption },
-      }).promise;
 
       return {
         success: true,
-        fees: constructedTx.fee,
+        fees: coinSelection.fee,
       };
     } catch (error) {
-      logger.error('VotingStore: error while initializing VP delegation TX', {
-        error,
-      });
+      logger.error(
+        'VotingStore: error while initializing VP delegation TX with HW',
+        {
+          error,
+        }
+      );
       return {
         success: false,
         errorCode: parseApiCode(expectedInitializeVPDelegationTxErrors, error),