Merge branch 'develop' into chore/ddw-1223-from-cicero-to-hydra

Author: michalrus

CHANGELOG.md

@@ -13,7 +13,7 @@
 ### Chores
 
 - Switched from Cicero to Hydra ([PR 3135](https://github.com/input-output-hk/daedalus/pull/3135))
-- Updated @trezor/connect to v9.0.8 ([PR 3127](https://github.com/input-output-hk/daedalus/pull/3127))
+- Changed voting reward address to a payment address ([PR 3131](https://github.com/input-output-hk/daedalus/pull/3131- Updated @trezor/connect to v9.0.8 ([PR 3127](https://github.com/input-output-hk/daedalus/pull/3127))
 - Add members of Cardano Wallet team to the "About Daedalus" screen ([PR 3092](https://github.com/input-output-hk/daedalus/pull/3092))
 - Removed Chromatic from project ([PR 3126](https://github.com/input-output-hk/daedalus/pull/3126))
 - Upgraded Electron to 24.2, and Node.js to 18.× ([PR 3124](https://github.com/input-output-hk/daedalus/pull/3124))

source/renderer/app/api/transactions/types.ts

@@ -272,6 +272,10 @@ export type VotingMetadataType = Record<
   VotingMetaRegistrationType
 >;
 export type VotingDataType = {
+  address: {
+    id: string;
+    spendingPath: string;
+  };
   stakeAddress: string;
   stakeAddressHex: string;
   votingKey: string;

source/renderer/app/stores/HardwareWalletsStore.ts

@@ -2251,19 +2251,20 @@ export default class HardwareWalletsStore extends Store {
     let auxiliaryData = null;
 
     if (this.votingData) {
-      const { stakeAddress, stakeKey, votingKey, nonce } = this.votingData;
+      const { address, stakeKey, votingKey, nonce } = this.votingData;
       unsignedTxAuxiliaryData = {
         nonce,
         // unique increaseable number e.g. current epoch number or absolute slot number ( identifies unique tx / vote registration )
         rewardDestinationAddress: {
-          address: stakeAddress,
+          address,
           stakingPath: [2147485500, 2147485463, 2147483648, 2, 0],
         },
         stakePubKey: stakeKey,
         type: CATALYST_VOTING_REGISTRATION_TYPE,
         votingPubKey: votingKey,
       };
       auxiliaryData = prepareTrezorAuxiliaryData({
+        address,
         votingKey,
         nonce: nonce.toString(),
       });
@@ -2575,12 +2576,12 @@ export default class HardwareWalletsStore extends Store {
     let unsignedTxAuxiliaryData = null;
 
     if (this.votingData) {
-      const { stakeAddress, stakeKey, votingKey, nonce } = this.votingData;
+      const { address, stakeKey, votingKey, nonce } = this.votingData;
       unsignedTxAuxiliaryData = {
         nonce,
         // unique increasable number e.g. current epoch number or absolute slot number ( identifies unique tx / vote registration )
         rewardDestinationAddress: {
-          address: stakeAddress,
+          address,
           stakingPath: [2147485500, 2147485463, 2147483648, 2, 0],
         },
         stakePubKey: stakeKey,

source/renderer/app/stores/VotingStore.ts

@@ -32,8 +32,7 @@ export type VotingRegistrationKeyType = {
   public: (...args: Array<any>) => any;
 };
 export type VotingDataType = {
-  stakeAddress: string;
-  stakeAddressHex: string;
+  addressHex: string;
   votingKey: string;
   stakeKey: string;
   role: PathRoleIdentityType;
@@ -214,9 +213,10 @@ export default class VotingStore extends Store {
   };
   prepareVotingData = async ({ walletId }: { walletId: string }) => {
     try {
-      const { stakeAddresses } = this.stores.addresses;
-      const stakeAddress = stakeAddresses[walletId];
-      const stakeAddressHex = await this._getHexFromBech32(stakeAddress);
+      const [address] = await this.stores.addresses.getAddressesByWalletId(
+        walletId
+      );
+      const addressHex = await this._getHexFromBech32(address.id);
       await this._generateVotingRegistrationKey();
       if (!this.votingRegistrationKey)
         throw new Error('Failed to generate voting registration key.');
@@ -255,7 +255,7 @@ export default class VotingStore extends Store {
                 int: 3,
               },
               v: {
-                bytes: stakeAddressHex,
+                bytes: addressHex,
               },
             },
             {
@@ -283,8 +283,8 @@ export default class VotingStore extends Store {
         },
       };
       const votingData = {
-        stakeAddress,
-        stakeAddressHex,
+        address,
+        addressHex,
         votingKey,
         stakeKey,
         role: 'mutable_account',
@@ -337,16 +337,10 @@ export default class VotingStore extends Store {
         const votingData = await this.prepareVotingData({
           walletId,
         });
-        const {
-          stakeAddressHex,
-          votingKey,
-          stakeKey,
-          role,
-          index,
-        } = votingData;
+        const { addressHex, votingKey, stakeKey, role, index } = votingData;
         // @ts-ignore ts-migrate(1320) FIXME: Type of 'await' operand must either be a valid pro... Remove this comment to see the full error message
         const signature = await this.signMetadataRequest.execute({
-          addressHex: stakeAddressHex,
+          addressHex,
           walletId,
           passphrase,
           votingKey,
@@ -359,7 +353,7 @@ export default class VotingStore extends Store {
           // @ts-ignore ts-migrate(1320) FIXME: Type of 'await' operand must either be a valid pro... Remove this comment to see the full error message
           await this.createVotingRegistrationTransactionRequest.execute({
             address: address.id,
-            addressHex: stakeAddressHex,
+            addressHex,
             amount,
             passphrase,
             walletId,

source/renderer/app/utils/shelleyLedger.ts

@@ -86,7 +86,10 @@ export type TxAuxiliaryData = {
   votingPubKey: string;
 };
 export type RewardDestinationAddressType = {
-  address: string;
+  address: {
+    id: string;
+    spendingPath: string;
+  };
   // type of "address.id"
   stakingPath: BIP32Path;
 };
@@ -484,9 +487,12 @@ export const prepareLedgerAuxiliaryData = (
         paymentDestination: {
           type: TxOutputDestinationType.DEVICE_OWNED,
           params: {
-            type: AddressType.REWARD_KEY,
+            type: AddressType.BASE_PAYMENT_KEY_STAKE_KEY,
             params: {
               stakingPath: rewardDestinationAddress.stakingPath,
+              spendingPath: str_to_path(
+                rewardDestinationAddress.address.spendingPath
+              ),
             },
           },
         },
@@ -513,7 +519,7 @@ export const cborizeTxVotingRegistration = ({
     new Map<number, Buffer | number>([
       [1, Buffer.from(votingPubKey, 'hex')],
       [2, Buffer.from(stakePubKey, 'hex')],
-      [3, utils.bech32_decodeAddress(rewardDestinationAddress.address)],
+      [3, utils.bech32_decodeAddress(rewardDestinationAddress.address.id)],
       [4, Number(nonce)],
     ]),
   ];

source/renderer/app/utils/shelleyTrezor.ts

@@ -75,20 +75,26 @@ export const prepareTrezorWithdrawal = (
   };
 };
 export type TrezorVotingDataType = {
+  address: {
+    id: string;
+    spendingPath: string;
+  };
   votingKey: string;
   nonce: string;
 };
 
 export const prepareTrezorAuxiliaryData = ({
+  address,
   votingKey,
   nonce,
 }: TrezorVotingDataType) => ({
   cVoteRegistrationParameters: {
     votePublicKey: votingKey,
     stakingPath: "m/1852'/1815'/0'/2/0",
     paymentAddressParameters: {
-      addressType: Messages.CardanoAddressType.REWARD,
-      path: "m/1852'/1815'/0'/2/0",
+      addressType: Messages.CardanoAddressType.BASE,
+      path: `m/${address.spendingPath}`,
+      stakingPath: "m/1852'/1815'/0'/2/0",
     },
     nonce,
     format: Messages.CardanoCVoteRegistrationFormat.CIP15, // Catalyst voting format