@bsv/sdk 2.0.16 → 2.1.1

package/dist/esm/src/wallet/substrates/WalletWireProcessor.js

@@ -284,26 +284,29 @@ export default class WalletWireProcessor {
                         resultWriter.writeInt8(0);
                     }
                     // tx
-                    if (createActionResult.tx != null) {
+                    if (createActionResult.tx == null) {
+                        resultWriter.writeInt8(0);
+                    }
+                    else {
                         resultWriter.writeInt8(1);
                         resultWriter.writeVarIntNum(createActionResult.tx.length);
                         resultWriter.write(createActionResult.tx);
                     }
-                    else {
-                        resultWriter.writeInt8(0);
-                    }
                     // noSendChange
-                    if (createActionResult.noSendChange != null) {
+                    if (createActionResult.noSendChange == null) {
+                        resultWriter.writeVarIntNum(-1);
+                    }
+                    else {
                         resultWriter.writeVarIntNum(createActionResult.noSendChange.length);
                         for (const outpoint of createActionResult.noSendChange) {
                             resultWriter.write(this.encodeOutpoint(outpoint));
                         }
                     }
-                    else {
+                    // sendWithResults
+                    if (createActionResult.sendWithResults == null) {
                         resultWriter.writeVarIntNum(-1);
                     }
-                    // sendWithResults
-                    if (createActionResult.sendWithResults != null) {
+                    else {
                         resultWriter.writeVarIntNum(createActionResult.sendWithResults.length);
                         for (const result of createActionResult.sendWithResults) {
                             resultWriter.write(Utils.toArray(result.txid, 'hex'));
@@ -317,11 +320,11 @@ export default class WalletWireProcessor {
                             resultWriter.writeInt8(statusCode);
                         }
                     }
-                    else {
-                        resultWriter.writeVarIntNum(-1);
-                    }
                     // signableTransaction
-                    if (createActionResult.signableTransaction != null) {
+                    if (createActionResult.signableTransaction == null) {
+                        resultWriter.writeInt8(0);
+                    }
+                    else {
                         resultWriter.writeInt8(1);
                         resultWriter.writeVarIntNum(createActionResult.signableTransaction.tx.length);
                         resultWriter.write(createActionResult.signableTransaction.tx);
@@ -329,9 +332,6 @@ export default class WalletWireProcessor {
                         resultWriter.writeVarIntNum(referenceBytes.length);
                         resultWriter.write(referenceBytes);
                     }
-                    else {
-                        resultWriter.writeInt8(0);
-                    }
                     // Return success code and result
                     const responseWriter = new Utils.Writer();
                     responseWriter.writeUInt8(0); // errorByte = 0
@@ -423,16 +423,19 @@ export default class WalletWireProcessor {
                         resultWriter.writeInt8(0);
                     }
                     // tx
-                    if (signActionResult.tx != null) {
+                    if (signActionResult.tx == null) {
+                        resultWriter.writeInt8(0);
+                    }
+                    else {
                         resultWriter.writeInt8(1);
                         resultWriter.writeVarIntNum(signActionResult.tx.length);
                         resultWriter.write(signActionResult.tx);
                     }
-                    else {
-                        resultWriter.writeInt8(0);
-                    }
                     // sendWithResults
-                    if (signActionResult.sendWithResults != null) {
+                    if (signActionResult.sendWithResults == null) {
+                        resultWriter.writeVarIntNum(-1);
+                    }
+                    else {
                         resultWriter.writeVarIntNum(signActionResult.sendWithResults.length);
                         for (const result of signActionResult.sendWithResults) {
                             resultWriter.write(Utils.toArray(result.txid, 'hex'));
@@ -446,9 +449,6 @@ export default class WalletWireProcessor {
                             resultWriter.writeInt8(statusCode);
                         }
                     }
-                    else {
-                        resultWriter.writeVarIntNum(-1);
-                    }
                     // Return success code and result
                     const responseWriter = new Utils.Writer();
                     responseWriter.writeUInt8(0); // errorByte = 0
@@ -580,7 +580,10 @@ export default class WalletWireProcessor {
                         resultWriter.writeVarIntNum(descriptionBytes.length);
                         resultWriter.write(descriptionBytes);
                         // labels
-                        if (action.labels !== undefined) {
+                        if (action.labels === undefined) {
+                            resultWriter.writeVarIntNum(-1);
+                        }
+                        else {
                             resultWriter.writeVarIntNum(action.labels.length);
                             for (const label of action.labels) {
                                 const labelBytes = Utils.toArray(label, 'utf8');
@@ -588,15 +591,15 @@ export default class WalletWireProcessor {
                                 resultWriter.write(labelBytes);
                             }
                         }
-                        else {
-                            resultWriter.writeVarIntNum(-1);
-                        }
                         // version
                         resultWriter.writeVarIntNum(action.version);
                         // lockTime
                         resultWriter.writeVarIntNum(action.lockTime);
                         // inputs
-                        if (action.inputs !== undefined) {
+                        if (action.inputs === undefined) {
+                            resultWriter.writeVarIntNum(-1);
+                        }
+                        else {
                             resultWriter.writeVarIntNum(action.inputs.length);
                             for (const input of action.inputs) {
                                 // sourceOutpoint
@@ -604,23 +607,23 @@ export default class WalletWireProcessor {
                                 // sourceSatoshis
                                 resultWriter.writeVarIntNum(input.sourceSatoshis);
                                 // sourceLockingScript
-                                if (input.sourceLockingScript !== undefined) {
+                                if (input.sourceLockingScript === undefined) {
+                                    resultWriter.writeVarIntNum(-1);
+                                }
+                                else {
                                     const sourceLockingScriptBytes = Utils.toArray(input.sourceLockingScript, 'hex');
                                     resultWriter.writeVarIntNum(sourceLockingScriptBytes.length);
                                     resultWriter.write(sourceLockingScriptBytes);
                                 }
-                                else {
+                                // unlockingScript
+                                if (input.unlockingScript === undefined) {
                                     resultWriter.writeVarIntNum(-1);
                                 }
-                                // unlockingScript
-                                if (input.unlockingScript !== undefined) {
+                                else {
                                     const unlockingScriptBytes = Utils.toArray(input.unlockingScript, 'hex');
                                     resultWriter.writeVarIntNum(unlockingScriptBytes.length);
                                     resultWriter.write(unlockingScriptBytes);
                                 }
-                                else {
-                                    resultWriter.writeVarIntNum(-1);
-                                }
                                 // inputDescription
                                 const inputDescriptionBytes = Utils.toArray(input.inputDescription, 'utf8');
                                 resultWriter.writeVarIntNum(inputDescriptionBytes.length);
@@ -629,11 +632,11 @@ export default class WalletWireProcessor {
                                 resultWriter.writeVarIntNum(input.sequenceNumber);
                             }
                         }
-                        else {
+                        // outputs
+                        if (action.outputs === undefined) {
                             resultWriter.writeVarIntNum(-1);
                         }
-                        // outputs
-                        if (action.outputs !== undefined) {
+                        else {
                             resultWriter.writeVarIntNum(action.outputs.length);
                             for (const output of action.outputs) {
                                 // outputIndex
@@ -641,14 +644,14 @@ export default class WalletWireProcessor {
                                 // satoshis
                                 resultWriter.writeVarIntNum(output.satoshis);
                                 // lockingScript
-                                if (output.lockingScript !== undefined) {
+                                if (output.lockingScript === undefined) {
+                                    resultWriter.writeVarIntNum(-1);
+                                }
+                                else {
                                     const lockingScriptBytes = Utils.toArray(output.lockingScript, 'hex');
                                     resultWriter.writeVarIntNum(lockingScriptBytes.length);
                                     resultWriter.write(lockingScriptBytes);
                                 }
-                                else {
-                                    resultWriter.writeVarIntNum(-1);
-                                }
                                 // spendable
                                 resultWriter.writeInt8(output.spendable ? 1 : 0);
                                 // outputDescription
@@ -656,16 +659,19 @@ export default class WalletWireProcessor {
                                 resultWriter.writeVarIntNum(outputDescriptionBytes.length);
                                 resultWriter.write(outputDescriptionBytes);
                                 // basket
-                                if (output.basket !== undefined) {
+                                if (output.basket === undefined) {
+                                    resultWriter.writeVarIntNum(-1);
+                                }
+                                else {
                                     const basketBytes = Utils.toArray(output.basket, 'utf8');
                                     resultWriter.writeVarIntNum(basketBytes.length);
                                     resultWriter.write(basketBytes);
                                 }
-                                else {
+                                // tags
+                                if (output.tags === undefined) {
                                     resultWriter.writeVarIntNum(-1);
                                 }
-                                // tags
-                                if (output.tags !== undefined) {
+                                else {
                                     resultWriter.writeVarIntNum(output.tags.length);
                                     for (const tag of output.tags) {
                                         const tagBytes = Utils.toArray(tag, 'utf8');
@@ -673,23 +679,17 @@ export default class WalletWireProcessor {
                                         resultWriter.write(tagBytes);
                                     }
                                 }
-                                else {
+                                // customInstructions
+                                if (output.customInstructions === undefined) {
                                     resultWriter.writeVarIntNum(-1);
                                 }
-                                // customInstructions
-                                if (output.customInstructions !== undefined) {
+                                else {
                                     const customInstructionsBytes = Utils.toArray(output.customInstructions, 'utf8');
                                     resultWriter.writeVarIntNum(customInstructionsBytes.length);
                                     resultWriter.write(customInstructionsBytes);
                                 }
-                                else {
-                                    resultWriter.writeVarIntNum(-1);
-                                }
                             }
                         }
-                        else {
-                            resultWriter.writeVarIntNum(-1);
-                        }
                     }
                     const responseWriter = new Utils.Writer();
                     responseWriter.writeUInt8(0); // errorByte = 0
@@ -876,12 +876,12 @@ export default class WalletWireProcessor {
                     // totalOutputs
                     resultWriter.writeVarIntNum(listOutputsResult.totalOutputs);
                     // BEEF length and BEEF or -1
-                    if (listOutputsResult.BEEF != null) {
-                        resultWriter.writeVarIntNum(listOutputsResult.BEEF.length);
-                        resultWriter.write(listOutputsResult.BEEF);
+                    if (listOutputsResult.BEEF == null) {
+                        resultWriter.writeVarIntNum(-1);
                     }
                     else {
-                        resultWriter.writeVarIntNum(-1);
+                        resultWriter.writeVarIntNum(listOutputsResult.BEEF.length);
+                        resultWriter.write(listOutputsResult.BEEF);
                     }
                     // outputs
                     for (const output of listOutputsResult.outputs) {
@@ -890,25 +890,28 @@ export default class WalletWireProcessor {
                         // satoshis
                         resultWriter.writeVarIntNum(output.satoshis);
                         // lockingScript
-                        if (output.lockingScript !== undefined) {
+                        if (output.lockingScript === undefined) {
+                            resultWriter.writeVarIntNum(-1);
+                        }
+                        else {
                             const lockingScriptBytes = Utils.toArray(output.lockingScript, 'hex');
                             resultWriter.writeVarIntNum(lockingScriptBytes.length);
                             resultWriter.write(lockingScriptBytes);
                         }
-                        else {
+                        // customInstructions
+                        if (output.customInstructions === undefined) {
                             resultWriter.writeVarIntNum(-1);
                         }
-                        // customInstructions
-                        if (output.customInstructions !== undefined) {
+                        else {
                             const customInstructionsBytes = Utils.toArray(output.customInstructions, 'utf8');
                             resultWriter.writeVarIntNum(customInstructionsBytes.length);
                             resultWriter.write(customInstructionsBytes);
                         }
-                        else {
+                        // tags
+                        if (output.tags === undefined) {
                             resultWriter.writeVarIntNum(-1);
                         }
-                        // tags
-                        if (output.tags !== undefined) {
+                        else {
                             resultWriter.writeVarIntNum(output.tags.length);
                             for (const tag of output.tags) {
                                 const tagBytes = Utils.toArray(tag, 'utf8');
@@ -916,11 +919,11 @@ export default class WalletWireProcessor {
                                 resultWriter.write(tagBytes);
                             }
                         }
-                        else {
+                        // labels
+                        if (output.labels === undefined) {
                             resultWriter.writeVarIntNum(-1);
                         }
-                        // labels
-                        if (output.labels !== undefined) {
+                        else {
                             resultWriter.writeVarIntNum(output.labels.length);
                             for (const label of output.labels) {
                                 const labelBytes = Utils.toArray(label, 'utf8');
@@ -928,9 +931,6 @@ export default class WalletWireProcessor {
                                 resultWriter.write(labelBytes);
                             }
                         }
-                        else {
-                            resultWriter.writeVarIntNum(-1);
-                        }
                     }
                     // Return success code and result
                     const responseWriter = new Utils.Writer();
@@ -958,13 +958,7 @@ export default class WalletWireProcessor {
                     // Deserialize identityKey flag
                     const identityKeyFlag = paramsReader.readUInt8();
                     args.identityKey = identityKeyFlag === 1;
-                    if (args.identityKey !== true) {
-                        // Deserialize protocolID
-                        args.protocolID = this.decodeProtocolID(paramsReader);
-                        // Deserialize keyID
-                        args.keyID = this.decodeString(paramsReader);
-                        // Deserialize counterparty
-                        args.counterparty = this.decodeCounterparty(paramsReader);
+                    if (args.identityKey === true) {
                         // Deserialize privilege parameters
                         const privilegedFlag = paramsReader.readInt8();
                         if (privilegedFlag === -1) {
@@ -974,23 +968,21 @@ export default class WalletWireProcessor {
                             args.privileged = privilegedFlag === 1;
                         }
                         const privilegedReasonLength = paramsReader.readInt8();
-                        if (privilegedReasonLength !== -1) {
-                            const privilegedReasonBytes = paramsReader.read(privilegedReasonLength);
-                            args.privilegedReason = Utils.toUTF8(privilegedReasonBytes);
-                        }
-                        else {
+                        if (privilegedReasonLength === -1) {
                             args.privilegedReason = undefined;
                         }
-                        // Deserialize forSelf
-                        const forSelfFlag = paramsReader.readInt8();
-                        if (forSelfFlag === -1) {
-                            args.forSelf = undefined;
-                        }
                         else {
-                            args.forSelf = forSelfFlag === 1;
+                            const privilegedReasonBytes = paramsReader.read(privilegedReasonLength);
+                            args.privilegedReason = Utils.toUTF8(privilegedReasonBytes);
                         }
                     }
                     else {
+                        // Deserialize protocolID
+                        args.protocolID = this.decodeProtocolID(paramsReader);
+                        // Deserialize keyID
+                        args.keyID = this.decodeString(paramsReader);
+                        // Deserialize counterparty
+                        args.counterparty = this.decodeCounterparty(paramsReader);
                         // Deserialize privilege parameters
                         const privilegedFlag = paramsReader.readInt8();
                         if (privilegedFlag === -1) {
@@ -1000,12 +992,20 @@ export default class WalletWireProcessor {
                             args.privileged = privilegedFlag === 1;
                         }
                         const privilegedReasonLength = paramsReader.readInt8();
-                        if (privilegedReasonLength !== -1) {
+                        if (privilegedReasonLength === -1) {
+                            args.privilegedReason = undefined;
+                        }
+                        else {
                             const privilegedReasonBytes = paramsReader.read(privilegedReasonLength);
                             args.privilegedReason = Utils.toUTF8(privilegedReasonBytes);
                         }
+                        // Deserialize forSelf
+                        const forSelfFlag = paramsReader.readInt8();
+                        if (forSelfFlag === -1) {
+                            args.forSelf = undefined;
+                        }
                         else {
-                            args.privilegedReason = undefined;
+                            args.forSelf = forSelfFlag === 1;
                         }
                     }
                     // Deserialize seekPermission