Use newly added Nimiq SDK enums for hardcoded values again

nimiq · Jan 13, 2025 · 492331b · 492331b
1 parent 432abc8
commit 492331b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/src/components/Network.vue b/src/components/Network.vue
@@ -22,7 +22,7 @@ class Network extends Vue {
         value,
         fee = 0,
         validityStartHeight,
-        flags = 0 /* Nimiq.Transaction.Flag.NONE */,
+        flags = Nimiq.TransactionFlag.None,
         recipientData,
         signerPubKey,
         signature,
@@ -51,12 +51,11 @@ class Network extends Vue {
             (recipientData && recipientData.length > 0)
             || senderType !== Nimiq.AccountType.Basic
             || recipientType !== Nimiq.AccountType.Basic
-            || flags !== 0 /* Nimiq.Transaction.Flag.NONE */
+            || flags !== Nimiq.TransactionFlag.None
         ) {
             let proof: Nimiq.SerialBuffer | undefined;
             if (signature) {
-                // 1 type + 32 publicKey + 1 empty merkle path + 64 signature
-                proof = new Nimiq.SerialBuffer(proofPrefix.length + 1 + 32 + 1 + 64);
+                proof = new Nimiq.SerialBuffer(proofPrefix.length + Nimiq.SignatureProof.SINGLE_SIG_SIZE);
                 proof.write(proofPrefix);
                 proof.write(Nimiq.SignatureProof.singleSig(signerPubKey, signature).serialize());
             }

diff --git a/src/lib/Cashlink.ts b/src/lib/Cashlink.ts
@@ -337,7 +337,7 @@ class Cashlink {
             this.address, Nimiq.AccountType.Basic, new Uint8Array(0),
             recipient, recipientType, CashlinkExtraData.CLAIMING,
             BigInt(balance - fee), BigInt(fee),
-            0 /* Nimiq.Transaction.Flag.NONE */,
+            Nimiq.TransactionFlag.None,
             await this._getBlockchainHeight(),
             await (await this._getNetwork()).getNetworkId(),
         );

diff --git a/src/lib/LedgerSwapProxy.ts b/src/lib/LedgerSwapProxy.ts
@@ -192,7 +192,7 @@ export default class LedgerSwapProxy {
 
     private static _getOriginalLocalSignerPublicKey(proxyFundingDataHex: string): Nimiq.PublicKey | null {
         const expectedDataHexLength =
-            (LedgerSwapProxyMarker.FUND.length + 32 /* Nimiq.PublicKey.SIZE */) * 2; // * 2 for hex
+            (LedgerSwapProxyMarker.FUND.length + Nimiq.PublicKey.SIZE) * 2; // * 2 for hex
         if (proxyFundingDataHex.length !== expectedDataHexLength
             || !proxyFundingDataHex.startsWith(Nimiq.BufferUtils.toHex(LedgerSwapProxyMarker.FUND))) return null;
         return new Nimiq.PublicKey(Nimiq.BufferUtils.fromHex(

diff --git a/src/lib/RequestParser.ts b/src/lib/RequestParser.ts
@@ -78,7 +78,7 @@ export class RequestParser {
                     data: typeof signTransactionRequest.extraData === 'string'
                         ? Utf8Tools.stringToUtf8ByteArray(signTransactionRequest.extraData)
                         : signTransactionRequest.extraData || new Uint8Array(0),
-                    flags: signTransactionRequest.flags || 0 /* Nimiq.Transaction.Flag.NONE */,
+                    flags: signTransactionRequest.flags || Nimiq.TransactionFlag.None,
                     validityStartHeight: signTransactionRequest.validityStartHeight,
                 } as ParsedSignTransactionRequest;
             case RequestType.SIGN_STAKING:
@@ -171,7 +171,7 @@ export class RequestParser {
                                 sender: checkoutRequest.sender,
                                 forceSender: !!checkoutRequest.forceSender,
                                 fee: checkoutRequest.fee || 0,
-                                flags: checkoutRequest.flags || 0 /* Nimiq.Transaction.Flag.NONE */,
+                                flags: checkoutRequest.flags || Nimiq.TransactionFlag.None,
                                 validityDuration: checkoutRequest.validityDuration,
                             },
                         })],

diff --git a/src/lib/paymentOptions/NimiqPaymentOptions.ts b/src/lib/paymentOptions/NimiqPaymentOptions.ts
@@ -79,7 +79,7 @@ export class ParsedNimiqDirectPaymentOptions extends ParsedPaymentOptions<Curren
 
         const requiresExtendedTransaction = extraData && extraData.byteLength > 0
             || (recipientType !== undefined && recipientType !== Nimiq.AccountType.Basic)
-            || (flags !== undefined && flags !== 0 /* Nimiq.Transaction.Flag.NONE */);
+            || (flags !== undefined && flags !== Nimiq.TransactionFlag.None);
         // Note that the transaction size can be bigger than this, for example if the sender type the user wants
         // to use requires an extended transaction or if an extended transaction includes a multi signature proof.
         // The size is therefore just an estimate. In the majority of cases the estimate will be accurate though
@@ -114,7 +114,7 @@ export class ParsedNimiqDirectPaymentOptions extends ParsedPaymentOptions<Curren
         if (this.parserFlags.isPointOfSale && (
             options.protocolSpecific.forceSender
             || (recipientType !== undefined && recipientType !== Nimiq.AccountType.Basic)
-            || (flags !== undefined && flags !== 0 /* Nimiq.Transaction.Flag.NONE */)
+            || (flags !== undefined && flags !== Nimiq.TransactionFlag.None)
             || (extraData && !Utf8Tools.isValidUtf8(extraData)) // only allow string data
         )) {
             throw new Error('isPointOfSale was set but requested sender, recipientType, flags or extraData can not '
@@ -127,7 +127,7 @@ export class ParsedNimiqDirectPaymentOptions extends ParsedPaymentOptions<Curren
             fee,
             feePerByte,
             extraData,
-            flags: flags || 0 /* Nimiq.Transaction.Flag.NONE */,
+            flags: flags || Nimiq.TransactionFlag.None,
             recipient,
             recipientType,
             validityDuration: !options.protocolSpecific.validityDuration

diff --git a/src/views/SetupSwapSuccess.vue b/src/views/SetupSwapSuccess.vue
@@ -594,7 +594,7 @@ export default class SetupSwapSuccess extends BitcoinSyncBaseView {
                 recipient: new Nimiq.Address(new Uint8Array(20)),
                 recipientType: Nimiq.AccountType.HTLC,
                 recipientData: htlcInfo.fund.htlcData,
-                flags: 1 /* Nimiq.Transaction.Flag.CONTRACT_CREATION */,
+                flags: Nimiq.TransactionFlag.ContractCreation,
                 signerPubKey: nimiqSignatureResult.publicKey,
                 signature: nimiqSignatureResult.signature,
             });

diff --git a/src/views/SignTransactionLedger.vue b/src/views/SignTransactionLedger.vue
@@ -320,7 +320,7 @@ export default class SignTransactionLedger extends Vue {
             ({ recipient, value, fee } = this.cashlink!.getFundingDetails());
             validityStartHeightPromise = network.getBlockchainHeight().then((blockchainHeight) => blockchainHeight + 1);
             recipientData = CASHLINK_FUNDING_DATA;
-            flags = 0 /* Nimiq.Transaction.Flag.NONE */;
+            flags = Nimiq.TransactionFlag.None;
 
             this.recipientDetails = {
                 address: this.cashlink.address.toUserFriendlyAddress(),
@@ -583,7 +583,7 @@ export default class SignTransactionLedger extends Vue {
         }
 
         // tslint:disable-next-line no-bitwise
-        if ((flags & 1 /* Nimiq.Transaction.Flag.CONTRACT_CREATION */) > 0) {
+        if ((flags & Nimiq.TransactionFlag.ContractCreation) > 0) {
             // TODO: Decode contract creation transactions
             // return ...
         }