@bsv/sdk 2.1.0 → 2.1.1

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

@@ -3,6 +3,16 @@ import Certificate from '../../auth/certificates/Certificate.js';
 import * as Utils from '../../primitives/utils.js';
 import calls from './WalletWireCalls.js';
 import { WalletError } from '../WalletError.js';
+const ACTION_STATUS_MAP = {
+    1: 'completed',
+    2: 'unprocessed',
+    3: 'sending',
+    4: 'unproven',
+    5: 'unsigned',
+    6: 'nosend',
+    7: 'nonfinal',
+    8: 'failed'
+};
 /**
  * A way to make remote calls to a wallet over a wallet wire.
  */
@@ -45,259 +55,69 @@ export default class WalletWireTransceiver {
     async createAction(args, originator) {
         const paramWriter = new Utils.Writer();
         // Serialize description
-        const descriptionBytes = Utils.toArray(args.description, 'utf8');
-        paramWriter.writeVarIntNum(descriptionBytes.length);
-        paramWriter.write(descriptionBytes);
+        this.writeUTF8(paramWriter, args.description);
         // input BEEF
-        if (args.inputBEEF != null) {
+        if (args.inputBEEF == null) {
+            paramWriter.writeVarIntNum(-1);
+        }
+        else {
             paramWriter.writeVarIntNum(args.inputBEEF.length);
             paramWriter.write(args.inputBEEF);
         }
-        else {
+        // Serialize inputs
+        if (args.inputs == null) {
             paramWriter.writeVarIntNum(-1);
         }
-        // Serialize inputs
-        if (args.inputs != null) {
+        else {
             paramWriter.writeVarIntNum(args.inputs.length);
             for (const input of args.inputs) {
-                // outpoint
-                paramWriter.write(this.encodeOutpoint(input.outpoint));
-                // unlockingScript / unlockingScriptLength
-                if (input.unlockingScript != null && input.unlockingScript !== '') {
-                    const unlockingScriptBytes = Utils.toArray(input.unlockingScript, 'hex');
-                    paramWriter.writeVarIntNum(unlockingScriptBytes.length);
-                    paramWriter.write(unlockingScriptBytes);
-                }
-                else {
-                    paramWriter.writeVarIntNum(-1);
-                    paramWriter.writeVarIntNum(input.unlockingScriptLength ?? 0);
-                }
-                // inputDescription
-                const inputDescriptionBytes = Utils.toArray(input.inputDescription, 'utf8');
-                paramWriter.writeVarIntNum(inputDescriptionBytes.length);
-                paramWriter.write(inputDescriptionBytes);
-                // sequenceNumber
-                if (typeof input.sequenceNumber === 'number') {
-                    paramWriter.writeVarIntNum(input.sequenceNumber);
-                }
-                else {
-                    paramWriter.writeVarIntNum(-1);
-                }
+                this.serializeCreateActionInput(paramWriter, input);
             }
         }
-        else {
+        // Serialize outputs
+        if (args.outputs == null) {
             paramWriter.writeVarIntNum(-1);
         }
-        // Serialize outputs
-        if (args.outputs != null) {
+        else {
             paramWriter.writeVarIntNum(args.outputs.length);
             for (const output of args.outputs) {
-                // lockingScript
-                const lockingScriptBytes = Utils.toArray(output.lockingScript, 'hex');
-                paramWriter.writeVarIntNum(lockingScriptBytes.length);
-                paramWriter.write(lockingScriptBytes);
-                // satoshis
-                paramWriter.writeVarIntNum(output.satoshis);
-                // outputDescription
-                const outputDescriptionBytes = Utils.toArray(output.outputDescription, 'utf8');
-                paramWriter.writeVarIntNum(outputDescriptionBytes.length);
-                paramWriter.write(outputDescriptionBytes);
-                // basket
-                if (output.basket != null && output.basket !== '') {
-                    const basketBytes = Utils.toArray(output.basket, 'utf8');
-                    paramWriter.writeVarIntNum(basketBytes.length);
-                    paramWriter.write(basketBytes);
-                }
-                else {
-                    paramWriter.writeVarIntNum(-1);
-                }
-                // customInstructions
-                if (output.customInstructions != null && output.customInstructions !== '') {
-                    const customInstructionsBytes = Utils.toArray(output.customInstructions, 'utf8');
-                    paramWriter.writeVarIntNum(customInstructionsBytes.length);
-                    paramWriter.write(customInstructionsBytes);
-                }
-                else {
-                    paramWriter.writeVarIntNum(-1);
-                }
-                // tags
-                if (output.tags != null) {
-                    paramWriter.writeVarIntNum(output.tags.length);
-                    for (const tag of output.tags) {
-                        const tagBytes = Utils.toArray(tag, 'utf8');
-                        paramWriter.writeVarIntNum(tagBytes.length);
-                        paramWriter.write(tagBytes);
-                    }
-                }
-                else {
-                    paramWriter.writeVarIntNum(-1);
-                }
+                this.serializeCreateActionOutput(paramWriter, output);
             }
         }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
-        // Serialize lockTime
-        if (typeof args.lockTime === 'number') {
-            paramWriter.writeVarIntNum(args.lockTime);
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
-        // Serialize version
-        if (typeof args.version === 'number') {
-            paramWriter.writeVarIntNum(args.version);
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
+        // Serialize lockTime, version
+        this.writeOptionalVarInt(paramWriter, args.lockTime);
+        this.writeOptionalVarInt(paramWriter, args.version);
         // Serialize labels
-        if (args.labels != null) {
-            paramWriter.writeVarIntNum(args.labels.length);
-            for (const label of args.labels) {
-                const labelBytes = Utils.toArray(label, 'utf8');
-                paramWriter.writeVarIntNum(labelBytes.length);
-                paramWriter.write(labelBytes);
-            }
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
+        this.writeUTF8Array(paramWriter, args.labels);
         // Serialize options
-        if (args.options != null) {
-            paramWriter.writeInt8(1); // options present
-            // signAndProcess
-            if (typeof args.options.signAndProcess === 'boolean') {
-                paramWriter.writeInt8(args.options.signAndProcess ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // acceptDelayedBroadcast
-            if (typeof args.options.acceptDelayedBroadcast === 'boolean') {
-                paramWriter.writeInt8(args.options.acceptDelayedBroadcast ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // trustSelf
-            if (args.options.trustSelf === 'known') {
-                paramWriter.writeInt8(1);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // knownTxids
-            if (args.options.knownTxids != null) {
-                paramWriter.writeVarIntNum(args.options.knownTxids.length);
-                for (const txid of args.options.knownTxids) {
-                    const txidBytes = Utils.toArray(txid, 'hex');
-                    paramWriter.write(txidBytes);
-                }
-            }
-            else {
-                paramWriter.writeVarIntNum(-1);
-            }
-            // returnTXIDOnly
-            if (typeof args.options.returnTXIDOnly === 'boolean') {
-                paramWriter.writeInt8(args.options.returnTXIDOnly ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // noSend
-            if (typeof args.options.noSend === 'boolean') {
-                paramWriter.writeInt8(args.options.noSend ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // noSendChange
-            if (args.options.noSendChange != null) {
-                paramWriter.writeVarIntNum(args.options.noSendChange.length);
-                for (const outpoint of args.options.noSendChange) {
-                    paramWriter.write(this.encodeOutpoint(outpoint));
-                }
-            }
-            else {
-                paramWriter.writeVarIntNum(-1);
-            }
-            // sendWith
-            if (args.options.sendWith != null) {
-                paramWriter.writeVarIntNum(args.options.sendWith.length);
-                for (const txid of args.options.sendWith) {
-                    const txidBytes = Utils.toArray(txid, 'hex');
-                    paramWriter.write(txidBytes);
-                }
-            }
-            else {
-                paramWriter.writeVarIntNum(-1);
-            }
-            // randomizeOutputs
-            if (typeof args.options.randomizeOutputs === 'boolean') {
-                paramWriter.writeInt8(args.options.randomizeOutputs ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-        }
-        else {
-            paramWriter.writeInt8(0); // options not present
-        }
+        this.serializeCreateActionOptions(paramWriter, args.options);
         // Transmit and parse response
         const result = await this.transmit('createAction', originator, paramWriter.toArray());
+        return this.parseCreateActionResult(result);
+    }
+    parseCreateActionResult(result) {
         const resultReader = new Utils.Reader(result);
         const response = {};
-        // Parse txid
-        const txidFlag = resultReader.readInt8();
-        if (txidFlag === 1) {
-            const txidBytes = resultReader.read(32);
-            response.txid = Utils.toHex(txidBytes);
-        }
-        // Parse tx
-        const txFlag = resultReader.readInt8();
-        if (txFlag === 1) {
-            const txLength = resultReader.readVarIntNum();
-            response.tx = resultReader.read(txLength);
-        }
-        // Parse noSendChange
+        if (resultReader.readInt8() === 1) {
+            response.txid = Utils.toHex(resultReader.read(32));
+        }
+        if (resultReader.readInt8() === 1) {
+            response.tx = resultReader.read(resultReader.readVarIntNum());
+        }
         const noSendChangeLength = resultReader.readVarIntNum();
         if (noSendChangeLength >= 0) {
             response.noSendChange = [];
             for (let i = 0; i < noSendChangeLength; i++) {
-                const outpoint = this.readOutpoint(resultReader);
-                response.noSendChange.push(outpoint);
-            }
-        }
-        // Parse sendWithResults
-        const sendWithResultsLength = resultReader.readVarIntNum();
-        if (sendWithResultsLength >= 0) {
-            response.sendWithResults = [];
-            for (let i = 0; i < sendWithResultsLength; i++) {
-                const txidBytes = resultReader.read(32);
-                const txid = Utils.toHex(txidBytes);
-                const statusCode = resultReader.readInt8();
-                let status = 'unproven';
-                if (statusCode === 1)
-                    status = 'unproven';
-                else if (statusCode === 2)
-                    status = 'sending';
-                else if (statusCode === 3)
-                    status = 'failed';
-                response.sendWithResults.push({ txid, status });
+                response.noSendChange.push(this.readOutpoint(resultReader));
             }
         }
-        // Parse signableTransaction
-        const signableTransactionFlag = resultReader.readInt8();
-        if (signableTransactionFlag === 1) {
-            const txLength = resultReader.readVarIntNum();
-            const tx = resultReader.read(txLength);
-            const referenceLength = resultReader.readVarIntNum();
-            const referenceBytes = resultReader.read(referenceLength);
-            response.signableTransaction = {
-                tx,
-                reference: Utils.toBase64(referenceBytes)
-            };
+        const sendWithResults = this.readSendWithResults(resultReader);
+        if (sendWithResults != null)
+            response.sendWithResults = sendWithResults;
+        if (resultReader.readInt8() === 1) {
+            const tx = resultReader.read(resultReader.readVarIntNum());
+            const referenceBytes = resultReader.read(resultReader.readVarIntNum());
+            response.signableTransaction = { tx, reference: Utils.toBase64(referenceBytes) };
         }
         return response;
     }
@@ -309,95 +129,30 @@ export default class WalletWireTransceiver {
         for (const index of spendIndexes) {
             paramWriter.writeVarIntNum(Number(index));
             const spend = args.spends[Number(index)];
-            // unlockingScript
             const unlockingScriptBytes = Utils.toArray(spend.unlockingScript, 'hex');
             paramWriter.writeVarIntNum(unlockingScriptBytes.length);
             paramWriter.write(unlockingScriptBytes);
-            // sequenceNumber
-            if (typeof spend.sequenceNumber === 'number') {
-                paramWriter.writeVarIntNum(spend.sequenceNumber);
-            }
-            else {
-                paramWriter.writeVarIntNum(-1);
-            }
+            this.writeOptionalVarInt(paramWriter, spend.sequenceNumber);
         }
         // Serialize reference
         const referenceBytes = Utils.toArray(args.reference, 'base64');
         paramWriter.writeVarIntNum(referenceBytes.length);
         paramWriter.write(referenceBytes);
         // Serialize options
-        if (args.options != null) {
-            paramWriter.writeInt8(1); // options present
-            // acceptDelayedBroadcast
-            if (typeof args.options.acceptDelayedBroadcast === 'boolean') {
-                paramWriter.writeInt8(args.options.acceptDelayedBroadcast ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // returnTXIDOnly
-            if (typeof args.options.returnTXIDOnly === 'boolean') {
-                paramWriter.writeInt8(args.options.returnTXIDOnly ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // noSend
-            if (typeof args.options.noSend === 'boolean') {
-                paramWriter.writeInt8(args.options.noSend ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-            // sendWith
-            if (args.options.sendWith != null) {
-                paramWriter.writeVarIntNum(args.options.sendWith.length);
-                for (const txid of args.options.sendWith) {
-                    const txidBytes = Utils.toArray(txid, 'hex');
-                    paramWriter.write(txidBytes);
-                }
-            }
-            else {
-                paramWriter.writeVarIntNum(-1);
-            }
-        }
-        else {
-            paramWriter.writeInt8(0); // options not present
-        }
+        this.serializeSignActionOptions(paramWriter, args.options);
         // Transmit and parse response
         const result = await this.transmit('signAction', originator, paramWriter.toArray());
         const resultReader = new Utils.Reader(result);
         const response = {};
-        // Parse txid
-        const txidFlag = resultReader.readInt8();
-        if (txidFlag === 1) {
-            const txidBytes = resultReader.read(32);
-            response.txid = Utils.toHex(txidBytes);
-        }
-        // Parse tx
-        const txFlag = resultReader.readInt8();
-        if (txFlag === 1) {
-            const txLength = resultReader.readVarIntNum();
-            response.tx = resultReader.read(txLength);
-        }
-        // Parse sendWithResults
-        const sendWithResultsLength = resultReader.readVarIntNum();
-        if (sendWithResultsLength >= 0) {
-            response.sendWithResults = [];
-            for (let i = 0; i < sendWithResultsLength; i++) {
-                const txidBytes = resultReader.read(32);
-                const txid = Utils.toHex(txidBytes);
-                const statusCode = resultReader.readInt8();
-                let status = 'unproven';
-                if (statusCode === 1)
-                    status = 'unproven';
-                else if (statusCode === 2)
-                    status = 'sending';
-                else if (statusCode === 3)
-                    status = 'failed';
-                response.sendWithResults.push({ txid, status });
-            }
+        if (resultReader.readInt8() === 1) {
+            response.txid = Utils.toHex(resultReader.read(32));
         }
+        if (resultReader.readInt8() === 1) {
+            response.tx = resultReader.read(resultReader.readVarIntNum());
+        }
+        const sendWithResults = this.readSendWithResults(resultReader);
+        if (sendWithResults != null)
+            response.sendWithResults = sendWithResults;
         return response;
     }
     async abortAction(args, originator) {
@@ -406,223 +161,109 @@ export default class WalletWireTransceiver {
     }
     async listActions(args, originator) {
         const paramWriter = new Utils.Writer();
-        // Serialize labels
+        // Serialize labels (always-present array, no -1 sentinel)
         paramWriter.writeVarIntNum(args.labels.length);
         for (const label of args.labels) {
-            const labelBytes = Utils.toArray(label, 'utf8');
-            paramWriter.writeVarIntNum(labelBytes.length);
-            paramWriter.write(labelBytes);
+            this.writeUTF8(paramWriter, label);
         }
         // Serialize labelQueryMode
-        if (args.labelQueryMode === 'any') {
+        if (args.labelQueryMode === 'any')
             paramWriter.writeInt8(1);
-        }
-        else if (args.labelQueryMode === 'all') {
+        else if (args.labelQueryMode === 'all')
             paramWriter.writeInt8(2);
-        }
-        else {
+        else
             paramWriter.writeInt8(-1);
-        }
         // Serialize include options
-        const includeOptions = [
+        for (const option of [
             args.includeLabels,
             args.includeInputs,
             args.includeInputSourceLockingScripts,
             args.includeInputUnlockingScripts,
             args.includeOutputs,
             args.includeOutputLockingScripts
-        ];
-        for (const option of includeOptions) {
-            if (typeof option === 'boolean') {
-                paramWriter.writeInt8(option ? 1 : 0);
-            }
-            else {
-                paramWriter.writeInt8(-1);
-            }
-        }
-        // Serialize limit and offset
-        if (typeof args.limit === 'number') {
-            paramWriter.writeVarIntNum(args.limit);
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
+        ]) {
+            this.writeOptionalBool(paramWriter, option);
         }
-        if (typeof args.offset === 'number') {
-            paramWriter.writeVarIntNum(args.offset);
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
-        // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
-        // Transmit and parse response
+        this.writeOptionalVarInt(paramWriter, args.limit);
+        this.writeOptionalVarInt(paramWriter, args.offset);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         const result = await this.transmit('listActions', originator, paramWriter.toArray());
         const resultReader = new Utils.Reader(result);
         const totalActions = resultReader.readVarIntNum();
         const actions = [];
         for (let i = 0; i < totalActions; i++) {
-            // Parse action fields
-            const txidBytes = resultReader.read(32);
-            const txid = Utils.toHex(txidBytes);
-            const satoshis = resultReader.readVarIntNum();
-            const statusCode = resultReader.readInt8();
-            let status;
-            switch (statusCode) {
-                case 1:
-                    status = 'completed';
-                    break;
-                case 2:
-                    status = 'unprocessed';
-                    break;
-                case 3:
-                    status = 'sending';
-                    break;
-                case 4:
-                    status = 'unproven';
-                    break;
-                case 5:
-                    status = 'unsigned';
-                    break;
-                case 6:
-                    status = 'nosend';
-                    break;
-                case 7:
-                    status = 'nonfinal';
-                    break;
-                case 8:
-                    status = 'failed';
-                    break;
-                default:
-                    throw new Error(`Unknown status code: ${statusCode}`);
+            actions.push(this.parseAction(resultReader));
+        }
+        return { totalActions, actions };
+    }
+    parseActionStatus(code) {
+        const status = ACTION_STATUS_MAP[code];
+        if (status == null)
+            throw new Error(`Unknown status code: ${code}`);
+        return status;
+    }
+    parseAction(reader) {
+        const txid = Utils.toHex(reader.read(32));
+        const satoshis = reader.readVarIntNum();
+        const status = this.parseActionStatus(reader.readInt8());
+        const isOutgoing = reader.readInt8() === 1;
+        const description = Utils.toUTF8(reader.read(reader.readVarIntNum()));
+        const action = { txid, satoshis, status, isOutgoing, description, version: 0, lockTime: 0 };
+        const labelsLen = reader.readVarIntNum();
+        if (labelsLen >= 0) {
+            action.labels = [];
+            for (let j = 0; j < labelsLen; j++) {
+                action.labels.push(Utils.toUTF8(reader.read(reader.readVarIntNum())));
             }
-            const isOutgoing = resultReader.readInt8() === 1;
-            const descriptionLength = resultReader.readVarIntNum();
-            const descriptionBytes = resultReader.read(descriptionLength);
-            const description = Utils.toUTF8(descriptionBytes);
-            const action = {
-                txid,
-                satoshis,
-                status,
-                isOutgoing,
-                description,
-                version: 0,
-                lockTime: 0
-            };
-            // Parse labels
-            const labelsLength = resultReader.readVarIntNum();
-            if (labelsLength >= 0) {
-                action.labels = [];
-                for (let j = 0; j < labelsLength; j++) {
-                    const labelLength = resultReader.readVarIntNum();
-                    const labelBytes = resultReader.read(labelLength);
-                    action.labels.push(Utils.toUTF8(labelBytes));
-                }
+        }
+        action.version = reader.readVarIntNum();
+        action.lockTime = reader.readVarIntNum();
+        const inputsLen = reader.readVarIntNum();
+        if (inputsLen >= 0) {
+            action.inputs = [];
+            for (let k = 0; k < inputsLen; k++) {
+                action.inputs.push(this.parseActionInput(reader));
             }
-            // Parse version and lockTime
-            action.version = resultReader.readVarIntNum();
-            action.lockTime = resultReader.readVarIntNum();
-            // Parse inputs
-            const inputsLength = resultReader.readVarIntNum();
-            if (inputsLength >= 0) {
-                action.inputs = [];
-                for (let k = 0; k < inputsLength; k++) {
-                    const sourceOutpoint = this.readOutpoint(resultReader);
-                    const sourceSatoshis = resultReader.readVarIntNum();
-                    // sourceLockingScript
-                    const sourceLockingScriptLength = resultReader.readVarIntNum();
-                    let sourceLockingScript;
-                    if (sourceLockingScriptLength >= 0) {
-                        const sourceLockingScriptBytes = resultReader.read(sourceLockingScriptLength);
-                        sourceLockingScript = Utils.toHex(sourceLockingScriptBytes);
-                    }
-                    // unlockingScript
-                    const unlockingScriptLength = resultReader.readVarIntNum();
-                    let unlockingScript;
-                    if (unlockingScriptLength >= 0) {
-                        const unlockingScriptBytes = resultReader.read(unlockingScriptLength);
-                        unlockingScript = Utils.toHex(unlockingScriptBytes);
-                    }
-                    // inputDescription
-                    const inputDescriptionLength = resultReader.readVarIntNum();
-                    const inputDescriptionBytes = resultReader.read(inputDescriptionLength);
-                    const inputDescription = Utils.toUTF8(inputDescriptionBytes);
-                    // sequenceNumber
-                    const sequenceNumber = resultReader.readVarIntNum();
-                    action.inputs.push({
-                        sourceOutpoint,
-                        sourceSatoshis,
-                        sourceLockingScript,
-                        unlockingScript,
-                        inputDescription,
-                        sequenceNumber
-                    });
-                }
+        }
+        const outputsLen = reader.readVarIntNum();
+        if (outputsLen >= 0) {
+            action.outputs = [];
+            for (let l = 0; l < outputsLen; l++) {
+                action.outputs.push(this.parseActionOutput(reader));
             }
-            // Parse outputs
-            const outputsLength = resultReader.readVarIntNum();
-            if (outputsLength >= 0) {
-                action.outputs = [];
-                for (let l = 0; l < outputsLength; l++) {
-                    const outputIndex = resultReader.readVarIntNum();
-                    const satoshis = resultReader.readVarIntNum();
-                    // lockingScript
-                    const lockingScriptLength = resultReader.readVarIntNum();
-                    let lockingScript;
-                    if (lockingScriptLength >= 0) {
-                        const lockingScriptBytes = resultReader.read(lockingScriptLength);
-                        lockingScript = Utils.toHex(lockingScriptBytes);
-                    }
-                    const spendable = resultReader.readInt8() === 1;
-                    // outputDescription
-                    const outputDescriptionLength = resultReader.readVarIntNum();
-                    const outputDescriptionBytes = resultReader.read(outputDescriptionLength);
-                    const outputDescription = Utils.toUTF8(outputDescriptionBytes);
-                    // basket
-                    const basketLength = resultReader.readVarIntNum();
-                    let basket;
-                    if (basketLength >= 0) {
-                        const basketBytes = resultReader.read(basketLength);
-                        basket = Utils.toUTF8(basketBytes);
-                    }
-                    // tags
-                    const tagsLength = resultReader.readVarIntNum();
-                    const tags = [];
-                    if (tagsLength >= 0) {
-                        for (let m = 0; m < tagsLength; m++) {
-                            const tagLength = resultReader.readVarIntNum();
-                            const tagBytes = resultReader.read(tagLength);
-                            tags.push(Utils.toUTF8(tagBytes));
-                        }
-                    }
-                    // customInstructions
-                    const customInstructionsLength = resultReader.readVarIntNum();
-                    let customInstructions;
-                    if (customInstructionsLength >= 0) {
-                        const customInstructionsBytes = resultReader.read(customInstructionsLength);
-                        customInstructions = Utils.toUTF8(customInstructionsBytes);
-                    }
-                    action.outputs.push({
-                        outputIndex,
-                        satoshis,
-                        lockingScript,
-                        spendable,
-                        outputDescription,
-                        basket,
-                        tags,
-                        customInstructions
-                    });
-                }
+        }
+        return action;
+    }
+    parseActionInput(reader) {
+        const sourceOutpoint = this.readOutpoint(reader);
+        const sourceSatoshis = reader.readVarIntNum();
+        const srcLockLen = reader.readVarIntNum();
+        const sourceLockingScript = srcLockLen >= 0 ? Utils.toHex(reader.read(srcLockLen)) : undefined;
+        const unlockLen = reader.readVarIntNum();
+        const unlockingScript = unlockLen >= 0 ? Utils.toHex(reader.read(unlockLen)) : undefined;
+        const inputDescription = Utils.toUTF8(reader.read(reader.readVarIntNum()));
+        const sequenceNumber = reader.readVarIntNum();
+        return { sourceOutpoint, sourceSatoshis, sourceLockingScript, unlockingScript, inputDescription, sequenceNumber };
+    }
+    parseActionOutput(reader) {
+        const outputIndex = reader.readVarIntNum();
+        const satoshis = reader.readVarIntNum();
+        const lockLen = reader.readVarIntNum();
+        const lockingScript = lockLen >= 0 ? Utils.toHex(reader.read(lockLen)) : undefined;
+        const spendable = reader.readInt8() === 1;
+        const outputDescription = Utils.toUTF8(reader.read(reader.readVarIntNum()));
+        const basketLen = reader.readVarIntNum();
+        const basket = basketLen >= 0 ? Utils.toUTF8(reader.read(basketLen)) : undefined;
+        const tagsLen = reader.readVarIntNum();
+        const tags = [];
+        if (tagsLen >= 0) {
+            for (let m = 0; m < tagsLen; m++) {
+                tags.push(Utils.toUTF8(reader.read(reader.readVarIntNum())));
             }
-            actions.push(action);
         }
-        return {
-            totalActions,
-            actions
-        };
+        const custLen = reader.readVarIntNum();
+        const customInstructions = custLen >= 0 ? Utils.toUTF8(reader.read(custLen)) : undefined;
+        return { outputIndex, satoshis, lockingScript, spendable, outputDescription, basket: basket, tags, customInstructions };
     }
     async internalizeAction(args, originator) {
         const paramWriter = new Utils.Writer();
@@ -630,189 +271,119 @@ export default class WalletWireTransceiver {
         paramWriter.write(args.tx);
         paramWriter.writeVarIntNum(args.outputs.length);
         for (const out of args.outputs) {
-            paramWriter.writeVarIntNum(out.outputIndex);
-            if (out.protocol === 'wallet payment') {
-                if (out.paymentRemittance == null) {
-                    throw new Error('Payment remittance is required for wallet payment');
-                }
-                paramWriter.writeUInt8(1);
-                paramWriter.write(Utils.toArray(out.paymentRemittance.senderIdentityKey, 'hex'));
-                const derivationPrefixAsArray = Utils.toArray(out.paymentRemittance.derivationPrefix, 'base64');
-                paramWriter.writeVarIntNum(derivationPrefixAsArray.length);
-                paramWriter.write(derivationPrefixAsArray);
-                const derivationSuffixAsArray = Utils.toArray(out.paymentRemittance.derivationSuffix, 'base64');
-                paramWriter.writeVarIntNum(derivationSuffixAsArray.length);
-                paramWriter.write(derivationSuffixAsArray);
-            }
-            else {
-                paramWriter.writeUInt8(2);
-                const basketAsArray = Utils.toArray(out.insertionRemittance?.basket, 'utf8');
-                paramWriter.writeVarIntNum(basketAsArray.length);
-                paramWriter.write(basketAsArray);
-                if (typeof out.insertionRemittance?.customInstructions === 'string' && out.insertionRemittance.customInstructions !== '') {
-                    const customInstructionsAsArray = Utils.toArray(out.insertionRemittance.customInstructions, 'utf8');
-                    paramWriter.writeVarIntNum(customInstructionsAsArray.length);
-                    paramWriter.write(customInstructionsAsArray);
-                }
-                else {
-                    paramWriter.writeVarIntNum(-1);
-                }
-                if (typeof out.insertionRemittance?.tags === 'object') {
-                    paramWriter.writeVarIntNum(out.insertionRemittance.tags.length);
-                    for (const tag of out.insertionRemittance.tags) {
-                        const tagAsArray = Utils.toArray(tag, 'utf8');
-                        paramWriter.writeVarIntNum(tagAsArray.length);
-                        paramWriter.write(tagAsArray);
-                    }
-                }
-                else {
-                    paramWriter.writeVarIntNum(0);
-                }
-            }
-        }
-        if (typeof args.labels === 'object') {
-            paramWriter.writeVarIntNum(args.labels.length);
-            for (const l of args.labels) {
-                const labelAsArray = Utils.toArray(l, 'utf8');
-                paramWriter.writeVarIntNum(labelAsArray.length);
-                paramWriter.write(labelAsArray);
-            }
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
+            this.serializeInternalizeOutput(paramWriter, out);
         }
+        this.writeUTF8Array(paramWriter, typeof args.labels === 'object' ? args.labels : undefined);
         const descriptionAsArray = Utils.toArray(args.description);
         paramWriter.writeVarIntNum(descriptionAsArray.length);
         paramWriter.write(descriptionAsArray);
-        // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         await this.transmit('internalizeAction', originator, paramWriter.toArray());
         return { accepted: true };
     }
+    serializeInternalizeOutput(writer, out) {
+        writer.writeVarIntNum(out.outputIndex);
+        if (out.protocol === 'wallet payment') {
+            if (out.paymentRemittance == null) {
+                throw new Error('Payment remittance is required for wallet payment');
+            }
+            writer.writeUInt8(1);
+            writer.write(Utils.toArray(out.paymentRemittance.senderIdentityKey, 'hex'));
+            const prefix = Utils.toArray(out.paymentRemittance.derivationPrefix, 'base64');
+            writer.writeVarIntNum(prefix.length);
+            writer.write(prefix);
+            const suffix = Utils.toArray(out.paymentRemittance.derivationSuffix, 'base64');
+            writer.writeVarIntNum(suffix.length);
+            writer.write(suffix);
+        }
+        else {
+            writer.writeUInt8(2);
+            const basket = Utils.toArray(out.insertionRemittance?.basket, 'utf8');
+            writer.writeVarIntNum(basket.length);
+            writer.write(basket);
+            this.writeOptionalUTF8(writer, out.insertionRemittance?.customInstructions);
+            const tags = out.insertionRemittance?.tags;
+            if (typeof tags === 'object') {
+                writer.writeVarIntNum(tags.length);
+                for (const tag of tags) {
+                    const t = Utils.toArray(tag, 'utf8');
+                    writer.writeVarIntNum(t.length);
+                    writer.write(t);
+                }
+            }
+            else {
+                writer.writeVarIntNum(0);
+            }
+        }
+    }
     async listOutputs(args, originator) {
         const paramWriter = new Utils.Writer();
-        const basketAsArray = Utils.toArray(args.basket, 'utf8');
-        paramWriter.writeVarIntNum(basketAsArray.length);
-        paramWriter.write(basketAsArray);
+        this.writeUTF8(paramWriter, args.basket);
         if (typeof args.tags === 'object') {
             paramWriter.writeVarIntNum(args.tags.length);
             for (const tag of args.tags) {
-                const tagAsArray = Utils.toArray(tag, 'utf8');
-                paramWriter.writeVarIntNum(tagAsArray.length);
-                paramWriter.write(tagAsArray);
+                this.writeUTF8(paramWriter, tag);
             }
         }
         else {
             paramWriter.writeVarIntNum(0);
         }
-        if (args.tagQueryMode === 'all') {
+        if (args.tagQueryMode === 'all')
             paramWriter.writeInt8(1);
-        }
-        else if (args.tagQueryMode === 'any') {
+        else if (args.tagQueryMode === 'any')
             paramWriter.writeInt8(2);
-        }
-        else {
+        else
             paramWriter.writeInt8(-1);
-        }
-        if (args.include === 'locking scripts') {
+        if (args.include === 'locking scripts')
             paramWriter.writeInt8(1);
-        }
-        else if (args.include === 'entire transactions') {
+        else if (args.include === 'entire transactions')
             paramWriter.writeInt8(2);
-        }
-        else {
-            paramWriter.writeInt8(-1);
-        }
-        if (typeof args.includeCustomInstructions === 'boolean') {
-            paramWriter.writeInt8(args.includeCustomInstructions ? 1 : 0);
-        }
-        else {
+        else
             paramWriter.writeInt8(-1);
-        }
-        if (typeof args.includeTags === 'boolean') {
-            paramWriter.writeInt8(args.includeTags ? 1 : 0);
-        }
-        else {
-            paramWriter.writeInt8(-1);
-        }
-        if (typeof args.includeLabels === 'boolean') {
-            paramWriter.writeInt8(args.includeLabels ? 1 : 0);
-        }
-        else {
-            paramWriter.writeInt8(-1);
-        }
-        if (typeof args.limit === 'number') {
-            paramWriter.writeVarIntNum(args.limit);
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
-        if (typeof args.offset === 'number') {
-            paramWriter.writeVarIntNum(args.offset);
-        }
-        else {
-            paramWriter.writeVarIntNum(-1);
-        }
-        // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.includeCustomInstructions);
+        this.writeOptionalBool(paramWriter, args.includeTags);
+        this.writeOptionalBool(paramWriter, args.includeLabels);
+        this.writeOptionalVarInt(paramWriter, args.limit);
+        this.writeOptionalVarInt(paramWriter, args.offset);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         const result = await this.transmit('listOutputs', originator, paramWriter.toArray());
         const resultReader = new Utils.Reader(result);
         const totalOutputs = resultReader.readVarIntNum();
         const beefLength = resultReader.readVarIntNum();
-        let BEEF;
-        if (beefLength >= 0) {
-            BEEF = resultReader.read(beefLength);
-        }
+        const BEEF = beefLength >= 0 ? resultReader.read(beefLength) : undefined;
         const outputs = [];
         for (let i = 0; i < totalOutputs; i++) {
-            const outpoint = this.readOutpoint(resultReader);
-            const satoshis = resultReader.readVarIntNum();
-            const output = {
-                spendable: true,
-                outpoint,
-                satoshis
-            };
-            const scriptLength = resultReader.readVarIntNum();
-            if (scriptLength >= 0) {
-                output.lockingScript = Utils.toHex(resultReader.read(scriptLength));
-            }
-            const customInstructionsLength = resultReader.readVarIntNum();
-            if (customInstructionsLength >= 0) {
-                output.customInstructions = Utils.toUTF8(resultReader.read(customInstructionsLength));
-            }
-            const tagsLength = resultReader.readVarIntNum();
-            if (tagsLength !== -1) {
-                const tags = [];
-                for (let i = 0; i < tagsLength; i++) {
-                    const tagLength = resultReader.readVarIntNum();
-                    tags.push(Utils.toUTF8(resultReader.read(tagLength)));
-                }
-                output.tags = tags;
+            outputs.push(this.parseListOutputEntry(resultReader));
+        }
+        return { totalOutputs, BEEF, outputs };
+    }
+    parseListOutputEntry(reader) {
+        const outpoint = this.readOutpoint(reader);
+        const satoshis = reader.readVarIntNum();
+        const output = { spendable: true, outpoint, satoshis };
+        const scriptLen = reader.readVarIntNum();
+        if (scriptLen >= 0)
+            output.lockingScript = Utils.toHex(reader.read(scriptLen));
+        const custLen = reader.readVarIntNum();
+        if (custLen >= 0)
+            output.customInstructions = Utils.toUTF8(reader.read(custLen));
+        const tagsLen = reader.readVarIntNum();
+        if (tagsLen !== -1) {
+            const tags = [];
+            for (let i = 0; i < tagsLen; i++) {
+                tags.push(Utils.toUTF8(reader.read(reader.readVarIntNum())));
             }
-            const labelsLength = resultReader.readVarIntNum();
-            if (labelsLength !== -1) {
-                const labels = [];
-                for (let i = 0; i < labelsLength; i++) {
-                    const labelLength = resultReader.readVarIntNum();
-                    labels.push(Utils.toUTF8(resultReader.read(labelLength)));
-                }
-                output.labels = labels;
+            output.tags = tags;
+        }
+        const labelsLen = reader.readVarIntNum();
+        if (labelsLen !== -1) {
+            const labels = [];
+            for (let i = 0; i < labelsLen; i++) {
+                labels.push(Utils.toUTF8(reader.read(reader.readVarIntNum())));
             }
-            outputs.push(output);
+            output.labels = labels;
         }
-        return {
-            totalOutputs,
-            BEEF,
-            outputs
-        };
+        return output;
     }
     async relinquishOutput(args, originator) {
         const paramWriter = new Utils.Writer();
@@ -838,8 +409,13 @@ export default class WalletWireTransceiver {
     async getPublicKey(args, originator) {
         const paramWriter = new Utils.Writer();
         paramWriter.writeUInt8(args.identityKey ? 1 : 0);
-        if (!args.identityKey) {
-            paramWriter.write(this.encodeKeyRelatedParams(args.protocolID ??= [SecurityLevels.Silent, 'default'], args.keyID ??= '', args.counterparty, args.privileged, args.privilegedReason));
+        if (args.identityKey) {
+            paramWriter.write(this.encodePrivilegedParams(args.privileged, args.privilegedReason));
+        }
+        else {
+            args.protocolID ??= [SecurityLevels.Silent, 'default'];
+            args.keyID ??= '';
+            paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
             if (typeof args.forSelf === 'boolean') {
                 paramWriter.writeInt8(args.forSelf ? 1 : 0);
             }
@@ -847,15 +423,8 @@ export default class WalletWireTransceiver {
                 paramWriter.writeInt8(-1);
             }
         }
-        else {
-            paramWriter.write(this.encodePrivilegedParams(args.privileged, args.privilegedReason));
-        }
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         const result = await this.transmit('getPublicKey', originator, paramWriter.toArray());
         return {
             publicKey: Utils.toHex(result)
@@ -922,11 +491,7 @@ export default class WalletWireTransceiver {
         paramWriter.writeVarIntNum(args.plaintext.length);
         paramWriter.write(args.plaintext);
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         return {
             ciphertext: await this.transmit('encrypt', originator, paramWriter.toArray())
         };
@@ -937,11 +502,7 @@ export default class WalletWireTransceiver {
         paramWriter.writeVarIntNum(args.ciphertext.length);
         paramWriter.write(args.ciphertext);
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         return {
             plaintext: await this.transmit('decrypt', originator, paramWriter.toArray())
         };
@@ -952,11 +513,7 @@ export default class WalletWireTransceiver {
         paramWriter.writeVarIntNum(args.data.length);
         paramWriter.write(args.data);
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         return {
             hmac: await this.transmit('createHmac', originator, paramWriter.toArray())
         };
@@ -968,11 +525,7 @@ export default class WalletWireTransceiver {
         paramWriter.writeVarIntNum(args.data.length);
         paramWriter.write(args.data);
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         await this.transmit('verifyHmac', originator, paramWriter.toArray());
         return { valid: true };
     }
@@ -985,15 +538,12 @@ export default class WalletWireTransceiver {
             paramWriter.write(args.data);
         }
         else {
+            args.hashToDirectlySign ??= [];
             paramWriter.writeUInt8(2);
-            paramWriter.write(args.hashToDirectlySign ??= []);
+            paramWriter.write(args.hashToDirectlySign);
         }
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         return {
             signature: await this.transmit('createSignature', originator, paramWriter.toArray())
         };
@@ -1019,14 +569,148 @@ export default class WalletWireTransceiver {
             paramWriter.write(args.hashToDirectlyVerify ?? []);
         }
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         await this.transmit('verifySignature', originator, paramWriter.toArray());
         return { valid: true };
     }
+    /** Writes an optional boolean as Int8: 1/0 if present, -1 if absent. */
+    writeOptionalBool(writer, val) {
+        if (typeof val === 'boolean') {
+            writer.writeInt8(val ? 1 : 0);
+        }
+        else {
+            writer.writeInt8(-1);
+        }
+    }
+    /** Writes an optional number as VarInt: the value if present, -1 if absent. */
+    writeOptionalVarInt(writer, val) {
+        if (typeof val === 'number') {
+            writer.writeVarIntNum(val);
+        }
+        else {
+            writer.writeVarIntNum(-1);
+        }
+    }
+    /** Writes a UTF-8 string as (VarInt length, bytes). */
+    writeUTF8(writer, val) {
+        const bytes = Utils.toArray(val ?? '', 'utf8');
+        writer.writeVarIntNum(bytes.length);
+        writer.write(bytes);
+    }
+    /** Writes an optional UTF-8 string: (VarInt length, bytes) if non-empty, -1 if absent/empty. */
+    writeOptionalUTF8(writer, val) {
+        if (val != null && val !== '') {
+            const bytes = Utils.toArray(val, 'utf8');
+            writer.writeVarIntNum(bytes.length);
+            writer.write(bytes);
+        }
+        else {
+            writer.writeVarIntNum(-1);
+        }
+    }
+    /** Writes an array of UTF-8 strings as (VarInt count, ...items). -1 if null. */
+    writeUTF8Array(writer, arr) {
+        if (arr == null) {
+            writer.writeVarIntNum(-1);
+        }
+        else {
+            writer.writeVarIntNum(arr.length);
+            for (const item of arr) {
+                const bytes = Utils.toArray(item, 'utf8');
+                writer.writeVarIntNum(bytes.length);
+                writer.write(bytes);
+            }
+        }
+    }
+    /** Writes an array of hex-encoded txids (each 32 bytes) as (VarInt count, ...items). -1 if null. */
+    writeTxidArray(writer, arr) {
+        if (arr == null) {
+            writer.writeVarIntNum(-1);
+        }
+        else {
+            writer.writeVarIntNum(arr.length);
+            for (const txid of arr) {
+                writer.write(Utils.toArray(txid, 'hex'));
+            }
+        }
+    }
+    /** Reads a list of SendWithResults entries from a binary reader. */
+    readSendWithResults(reader) {
+        const len = reader.readVarIntNum();
+        if (len < 0)
+            return undefined;
+        const results = [];
+        for (let i = 0; i < len; i++) {
+            const txid = Utils.toHex(reader.read(32));
+            const code = reader.readInt8();
+            const status = code === 2 ? 'sending' : code === 3 ? 'failed' : 'unproven';
+            results.push({ txid, status });
+        }
+        return results;
+    }
+    /** Serializes a single createAction input to the writer. */
+    serializeCreateActionInput(writer, input) {
+        writer.write(this.encodeOutpoint(input.outpoint));
+        if (input.unlockingScript != null && input.unlockingScript !== '') {
+            const bytes = Utils.toArray(input.unlockingScript, 'hex');
+            writer.writeVarIntNum(bytes.length);
+            writer.write(bytes);
+        }
+        else {
+            writer.writeVarIntNum(-1);
+            writer.writeVarIntNum(input.unlockingScriptLength ?? 0);
+        }
+        this.writeUTF8(writer, input.inputDescription);
+        this.writeOptionalVarInt(writer, input.sequenceNumber);
+    }
+    /** Serializes a single createAction output to the writer. */
+    serializeCreateActionOutput(writer, output) {
+        const lockingBytes = Utils.toArray(output.lockingScript, 'hex');
+        writer.writeVarIntNum(lockingBytes.length);
+        writer.write(lockingBytes);
+        writer.writeVarIntNum(output.satoshis);
+        this.writeUTF8(writer, output.outputDescription);
+        this.writeOptionalUTF8(writer, output.basket);
+        this.writeOptionalUTF8(writer, output.customInstructions);
+        this.writeUTF8Array(writer, output.tags);
+    }
+    /** Serializes createAction options to the writer (Int8 presence byte + fields). */
+    serializeCreateActionOptions(writer, options) {
+        if (options == null) {
+            writer.writeInt8(0);
+            return;
+        }
+        writer.writeInt8(1);
+        this.writeOptionalBool(writer, options.signAndProcess);
+        this.writeOptionalBool(writer, options.acceptDelayedBroadcast);
+        writer.writeInt8(options.trustSelf === 'known' ? 1 : -1);
+        this.writeTxidArray(writer, options.knownTxids);
+        this.writeOptionalBool(writer, options.returnTXIDOnly);
+        this.writeOptionalBool(writer, options.noSend);
+        if (options.noSendChange == null) {
+            writer.writeVarIntNum(-1);
+        }
+        else {
+            writer.writeVarIntNum(options.noSendChange.length);
+            for (const outpoint of options.noSendChange) {
+                writer.write(this.encodeOutpoint(outpoint));
+            }
+        }
+        this.writeTxidArray(writer, options.sendWith);
+        this.writeOptionalBool(writer, options.randomizeOutputs);
+    }
+    /** Serializes signAction options to the writer (Int8 presence byte + fields). */
+    serializeSignActionOptions(writer, options) {
+        if (options == null) {
+            writer.writeInt8(0);
+            return;
+        }
+        writer.writeInt8(1);
+        this.writeOptionalBool(writer, options.acceptDelayedBroadcast);
+        this.writeOptionalBool(writer, options.returnTXIDOnly);
+        this.writeOptionalBool(writer, options.noSend);
+        this.writeTxidArray(writer, options.sendWith);
+    }
     encodeKeyRelatedParams(protocolID, keyID, counterparty, privileged, privilegedReason) {
         const paramWriter = new Utils.Writer();
         paramWriter.writeUInt8(protocolID[0]);
@@ -1073,17 +757,17 @@ export default class WalletWireTransceiver {
             const signatureAsArray = Utils.toArray(args.signature, 'hex');
             paramWriter.writeVarIntNum(signatureAsArray.length);
             paramWriter.write(signatureAsArray);
-            const keyringRevealerAsArray = args.keyringRevealer !== 'certifier'
-                ? Utils.toArray(args.keyringRevealer, 'hex')
-                : [11];
+            const keyringRevealerAsArray = args.keyringRevealer === 'certifier'
+                ? [11]
+                : Utils.toArray(args.keyringRevealer, 'hex');
             paramWriter.write(keyringRevealerAsArray);
             const keyringKeys = Object.keys(args.keyringForSubject ?? {});
             paramWriter.writeVarIntNum(keyringKeys.length);
-            for (let i = 0; i < keyringKeys.length; i++) {
-                const keyringKeysAsArray = Utils.toArray(keyringKeys[i], 'utf8');
+            for (const key of keyringKeys) {
+                const keyringKeysAsArray = Utils.toArray(key, 'utf8');
                 paramWriter.writeVarIntNum(keyringKeysAsArray.length);
                 paramWriter.write(keyringKeysAsArray);
-                const keyringForSubjectAsArray = Utils.toArray(args.keyringForSubject?.[keyringKeys[i]], 'base64');
+                const keyringForSubjectAsArray = Utils.toArray(args.keyringForSubject?.[key], 'base64');
                 paramWriter.writeVarIntNum(keyringForSubjectAsArray.length);
                 paramWriter.write(keyringForSubjectAsArray);
             }
@@ -1121,12 +805,12 @@ export default class WalletWireTransceiver {
     async listCertificates(args, originator) {
         const paramWriter = new Utils.Writer();
         paramWriter.writeVarIntNum(args.certifiers.length);
-        for (let i = 0; i < args.certifiers.length; i++) {
-            paramWriter.write(Utils.toArray(args.certifiers[i], 'hex'));
+        for (const certifier of args.certifiers) {
+            paramWriter.write(Utils.toArray(certifier, 'hex'));
         }
         paramWriter.writeVarIntNum(args.types.length);
-        for (let i = 0; i < args.types.length; i++) {
-            paramWriter.write(Utils.toArray(args.types[i], 'base64'));
+        for (const type of args.types) {
+            paramWriter.write(Utils.toArray(type, 'base64'));
         }
         if (typeof args.limit === 'number') {
             paramWriter.writeVarIntNum(args.limit);
@@ -1160,7 +844,7 @@ export default class WalletWireTransceiver {
                 }
             }
             const verifierLength = resultReader.readVarIntNum();
-            let verifier = undefined;
+            let verifier;
             if (verifierLength > 0) {
                 verifier = Utils.toUTF8(resultReader.read(verifierLength));
             }
@@ -1168,7 +852,7 @@ export default class WalletWireTransceiver {
                 ...cert,
                 signature: cert.signature,
                 keyring: keyringForVerifier,
-                verifier,
+                verifier
             });
         }
         return {
@@ -1294,11 +978,7 @@ export default class WalletWireTransceiver {
             paramWriter.writeVarIntNum(-1);
         }
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         const result = await this.transmit('discoverByIdentityKey', originator, paramWriter.toArray());
         return this.parseDiscoveryResult(result);
     }
@@ -1306,11 +986,11 @@ export default class WalletWireTransceiver {
         const paramWriter = new Utils.Writer();
         const attributeKeys = Object.keys(args.attributes);
         paramWriter.writeVarIntNum(attributeKeys.length);
-        for (let i = 0; i < attributeKeys.length; i++) {
-            paramWriter.writeVarIntNum(attributeKeys[i].length);
-            paramWriter.write(Utils.toArray(attributeKeys[i], 'utf8'));
-            paramWriter.writeVarIntNum(args.attributes[attributeKeys[i]].length);
-            paramWriter.write(Utils.toArray(args.attributes[attributeKeys[i]], 'utf8'));
+        for (const attrKey of attributeKeys) {
+            paramWriter.writeVarIntNum(attrKey.length);
+            paramWriter.write(Utils.toArray(attrKey, 'utf8'));
+            paramWriter.writeVarIntNum(args.attributes[attrKey].length);
+            paramWriter.write(Utils.toArray(args.attributes[attrKey], 'utf8'));
         }
         if (typeof args.limit === 'number') {
             paramWriter.writeVarIntNum(args.limit);
@@ -1325,11 +1005,7 @@ export default class WalletWireTransceiver {
             paramWriter.writeVarIntNum(-1);
         }
         // Serialize seekPermission
-        paramWriter.writeInt8(typeof args.seekPermission === 'boolean'
-            ? args.seekPermission
-                ? 1
-                : 0
-            : -1);
+        this.writeOptionalBool(paramWriter, args.seekPermission);
         const result = await this.transmit('discoverByAttributes', originator, paramWriter.toArray());
         return this.parseDiscoveryResult(result);
     }