Allow setting a custom senderType for SignMultisigTransaction

nimiq · Sep 28, 2024 · f4e6c18 · f4e6c18
1 parent 4a740c6
commit f4e6c18
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/client/PublicRequestTypes.ts b/client/PublicRequestTypes.ts
@@ -268,6 +268,7 @@ export interface SignMultisigTransactionRequest extends BasicRequest {
     signer: string; // Address
 
     sender: string;
+    senderType?: Nimiq.Account.Type;
     senderLabel: string;
     recipient: string;
     recipientType?: Nimiq.Account.Type;

diff --git a/src/lib/RequestParser.ts b/src/lib/RequestParser.ts
@@ -741,6 +741,7 @@ export class RequestParser {
                     signer: Nimiq.Address.fromAny(signMultisigTxRequest.signer),
 
                     sender: Nimiq.Address.fromString(signMultisigTxRequest.sender),
+                    senderType: signMultisigTxRequest.senderType || Nimiq.Account.Type.BASIC,
                     senderLabel: signMultisigTxRequest.senderLabel,
                     recipient: Nimiq.Address.fromString(signMultisigTxRequest.recipient),
                     recipientType: signMultisigTxRequest.recipientType || Nimiq.Account.Type.BASIC,
@@ -996,6 +997,7 @@ export class RequestParser {
                     signer: signMultisigTxRequest.signer.toUserFriendlyAddress(),
 
                     sender: signMultisigTxRequest.sender.toUserFriendlyAddress(),
+                    senderType: signMultisigTxRequest.senderType,
                     senderLabel: signMultisigTxRequest.senderLabel,
                     recipient: signMultisigTxRequest.recipient.toUserFriendlyAddress(),
                     recipientType: signMultisigTxRequest.recipientType,

diff --git a/src/lib/RequestTypes.ts b/src/lib/RequestTypes.ts
@@ -76,9 +76,10 @@ export interface ParsedSignMultisigTransactionRequest extends ParsedBasicRequest
     signer: Nimiq.Address;
 
     sender: Nimiq.Address;
+    senderType: Nimiq.Account.Type;
     senderLabel: string;
     recipient: Nimiq.Address;
-    recipientType?: Nimiq.Account.Type;
+    recipientType: Nimiq.Account.Type;
     recipientLabel?: string;
     value: number;
     fee?: number;

diff --git a/src/views/SignMultisigTransaction.vue b/src/views/SignMultisigTransaction.vue
@@ -46,7 +46,7 @@ export default class SignMultisigTransaction extends Vue {
 
             sender: this.request.sender.serialize(),
             senderLabel: this.request.senderLabel,
-            senderType: Nimiq.Account.Type.BASIC,
+            senderType: this.request.senderType,
             recipient: this.request.recipient.serialize(),
             recipientType: this.request.recipientType,
             recipientLabel: this.request.recipientLabel,