@bsv/sdk 1.2.20 → 1.2.21

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

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Certificate_js_1 = __importDefault(require("../../auth/Certificate.js"));
-const index_js_1 = require("../../primitives/index.js");
+const index_js_1 = require("../../auth/index.js");
+const index_js_2 = require("../../primitives/index.js");
 const WalletWireCalls_js_1 = __importDefault(require("./WalletWireCalls.js"));
 const WalletError_js_1 = require("../WalletError.js");
 /**
@@ -15,9 +15,9 @@ class WalletWireTransceiver {
         this.wire = wire;
     }
     async transmit(call, originator = '', params = []) {
-        const frameWriter = new index_js_1.Utils.Writer();
+        const frameWriter = new index_js_2.Utils.Writer();
         frameWriter.writeUInt8(WalletWireCalls_js_1.default[call]);
-        const originatorArray = index_js_1.Utils.toArray(originator, 'utf8');
+        const originatorArray = index_js_2.Utils.toArray(originator, 'utf8');
         frameWriter.writeUInt8(originatorArray.length);
         frameWriter.write(originatorArray);
         if (params.length > 0) {
@@ -25,7 +25,7 @@ class WalletWireTransceiver {
         }
         const frame = frameWriter.toArray();
         const result = await this.wire.transmitToWallet(frame);
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const errorByte = resultReader.readUInt8();
         if (errorByte === 0) {
             const resultFrame = resultReader.read();
@@ -35,20 +35,20 @@ class WalletWireTransceiver {
             // Deserialize the error message length
             const errorMessageLength = resultReader.readVarIntNum();
             const errorMessageBytes = resultReader.read(errorMessageLength);
-            const errorMessage = index_js_1.Utils.toUTF8(errorMessageBytes);
+            const errorMessage = index_js_2.Utils.toUTF8(errorMessageBytes);
             // Deserialize the stack trace length
             const stackTraceLength = resultReader.readVarIntNum();
             const stackTraceBytes = resultReader.read(stackTraceLength);
-            const stackTrace = index_js_1.Utils.toUTF8(stackTraceBytes);
+            const stackTrace = index_js_2.Utils.toUTF8(stackTraceBytes);
             // Construct a custom wallet error
             const e = new WalletError_js_1.WalletError(errorMessage, errorByte, stackTrace);
             throw e;
         }
     }
     async createAction(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         // Serialize description
-        const descriptionBytes = index_js_1.Utils.toArray(args.description, 'utf8');
+        const descriptionBytes = index_js_2.Utils.toArray(args.description, 'utf8');
         paramWriter.writeVarIntNum(descriptionBytes.length);
         paramWriter.write(descriptionBytes);
         // input BEEF
@@ -67,7 +67,7 @@ class WalletWireTransceiver {
                 paramWriter.write(this.encodeOutpoint(input.outpoint));
                 // unlockingScript / unlockingScriptLength
                 if (input.unlockingScript) {
-                    const unlockingScriptBytes = index_js_1.Utils.toArray(input.unlockingScript, 'hex');
+                    const unlockingScriptBytes = index_js_2.Utils.toArray(input.unlockingScript, 'hex');
                     paramWriter.writeVarIntNum(unlockingScriptBytes.length);
                     paramWriter.write(unlockingScriptBytes);
                 }
@@ -76,7 +76,7 @@ class WalletWireTransceiver {
                     paramWriter.writeVarIntNum(input.unlockingScriptLength);
                 }
                 // inputDescription
-                const inputDescriptionBytes = index_js_1.Utils.toArray(input.inputDescription, 'utf8');
+                const inputDescriptionBytes = index_js_2.Utils.toArray(input.inputDescription, 'utf8');
                 paramWriter.writeVarIntNum(inputDescriptionBytes.length);
                 paramWriter.write(inputDescriptionBytes);
                 // sequenceNumber
@@ -96,18 +96,18 @@ class WalletWireTransceiver {
             paramWriter.writeVarIntNum(args.outputs.length);
             for (const output of args.outputs) {
                 // lockingScript
-                const lockingScriptBytes = index_js_1.Utils.toArray(output.lockingScript, 'hex');
+                const lockingScriptBytes = index_js_2.Utils.toArray(output.lockingScript, 'hex');
                 paramWriter.writeVarIntNum(lockingScriptBytes.length);
                 paramWriter.write(lockingScriptBytes);
                 // satoshis
                 paramWriter.writeVarIntNum(output.satoshis);
                 // outputDescription
-                const outputDescriptionBytes = index_js_1.Utils.toArray(output.outputDescription, 'utf8');
+                const outputDescriptionBytes = index_js_2.Utils.toArray(output.outputDescription, 'utf8');
                 paramWriter.writeVarIntNum(outputDescriptionBytes.length);
                 paramWriter.write(outputDescriptionBytes);
                 // basket
                 if (output.basket) {
-                    const basketBytes = index_js_1.Utils.toArray(output.basket, 'utf8');
+                    const basketBytes = index_js_2.Utils.toArray(output.basket, 'utf8');
                     paramWriter.writeVarIntNum(basketBytes.length);
                     paramWriter.write(basketBytes);
                 }
@@ -116,7 +116,7 @@ class WalletWireTransceiver {
                 }
                 // customInstructions
                 if (output.customInstructions) {
-                    const customInstructionsBytes = index_js_1.Utils.toArray(output.customInstructions, 'utf8');
+                    const customInstructionsBytes = index_js_2.Utils.toArray(output.customInstructions, 'utf8');
                     paramWriter.writeVarIntNum(customInstructionsBytes.length);
                     paramWriter.write(customInstructionsBytes);
                 }
@@ -127,7 +127,7 @@ class WalletWireTransceiver {
                 if (output.tags) {
                     paramWriter.writeVarIntNum(output.tags.length);
                     for (const tag of output.tags) {
-                        const tagBytes = index_js_1.Utils.toArray(tag, 'utf8');
+                        const tagBytes = index_js_2.Utils.toArray(tag, 'utf8');
                         paramWriter.writeVarIntNum(tagBytes.length);
                         paramWriter.write(tagBytes);
                     }
@@ -158,7 +158,7 @@ class WalletWireTransceiver {
         if (args.labels) {
             paramWriter.writeVarIntNum(args.labels.length);
             for (const label of args.labels) {
-                const labelBytes = index_js_1.Utils.toArray(label, 'utf8');
+                const labelBytes = index_js_2.Utils.toArray(label, 'utf8');
                 paramWriter.writeVarIntNum(labelBytes.length);
                 paramWriter.write(labelBytes);
             }
@@ -194,7 +194,7 @@ class WalletWireTransceiver {
             if (args.options.knownTxids) {
                 paramWriter.writeVarIntNum(args.options.knownTxids.length);
                 for (const txid of args.options.knownTxids) {
-                    const txidBytes = index_js_1.Utils.toArray(txid, 'hex');
+                    const txidBytes = index_js_2.Utils.toArray(txid, 'hex');
                     paramWriter.write(txidBytes);
                 }
             }
@@ -229,7 +229,7 @@ class WalletWireTransceiver {
             if (args.options.sendWith) {
                 paramWriter.writeVarIntNum(args.options.sendWith.length);
                 for (const txid of args.options.sendWith) {
-                    const txidBytes = index_js_1.Utils.toArray(txid, 'hex');
+                    const txidBytes = index_js_2.Utils.toArray(txid, 'hex');
                     paramWriter.write(txidBytes);
                 }
             }
@@ -249,13 +249,13 @@ class WalletWireTransceiver {
         }
         // Transmit and parse response
         const result = await this.transmit('createAction', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const response = {};
         // Parse txid
         const txidFlag = resultReader.readInt8();
         if (txidFlag === 1) {
             const txidBytes = resultReader.read(32);
-            response.txid = index_js_1.Utils.toHex(txidBytes);
+            response.txid = index_js_2.Utils.toHex(txidBytes);
         }
         // Parse tx
         const txFlag = resultReader.readInt8();
@@ -278,7 +278,7 @@ class WalletWireTransceiver {
             response.sendWithResults = [];
             for (let i = 0; i < sendWithResultsLength; i++) {
                 const txidBytes = resultReader.read(32);
-                const txid = index_js_1.Utils.toHex(txidBytes);
+                const txid = index_js_2.Utils.toHex(txidBytes);
                 const statusCode = resultReader.readInt8();
                 let status;
                 if (statusCode === 1)
@@ -299,13 +299,13 @@ class WalletWireTransceiver {
             const referenceBytes = resultReader.read(referenceLength);
             response.signableTransaction = {
                 tx,
-                reference: index_js_1.Utils.toBase64(referenceBytes)
+                reference: index_js_2.Utils.toBase64(referenceBytes)
             };
         }
         return response;
     }
     async signAction(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         // Serialize spends
         const spendIndexes = Object.keys(args.spends);
         paramWriter.writeVarIntNum(spendIndexes.length);
@@ -313,7 +313,7 @@ class WalletWireTransceiver {
             paramWriter.writeVarIntNum(Number(index));
             const spend = args.spends[Number(index)];
             // unlockingScript
-            const unlockingScriptBytes = index_js_1.Utils.toArray(spend.unlockingScript, 'hex');
+            const unlockingScriptBytes = index_js_2.Utils.toArray(spend.unlockingScript, 'hex');
             paramWriter.writeVarIntNum(unlockingScriptBytes.length);
             paramWriter.write(unlockingScriptBytes);
             // sequenceNumber
@@ -325,7 +325,7 @@ class WalletWireTransceiver {
             }
         }
         // Serialize reference
-        const referenceBytes = index_js_1.Utils.toArray(args.reference, 'base64');
+        const referenceBytes = index_js_2.Utils.toArray(args.reference, 'base64');
         paramWriter.writeVarIntNum(referenceBytes.length);
         paramWriter.write(referenceBytes);
         // Serialize options
@@ -356,7 +356,7 @@ class WalletWireTransceiver {
             if (args.options.sendWith) {
                 paramWriter.writeVarIntNum(args.options.sendWith.length);
                 for (const txid of args.options.sendWith) {
-                    const txidBytes = index_js_1.Utils.toArray(txid, 'hex');
+                    const txidBytes = index_js_2.Utils.toArray(txid, 'hex');
                     paramWriter.write(txidBytes);
                 }
             }
@@ -369,13 +369,13 @@ class WalletWireTransceiver {
         }
         // Transmit and parse response
         const result = await this.transmit('signAction', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const response = {};
         // Parse txid
         const txidFlag = resultReader.readInt8();
         if (txidFlag === 1) {
             const txidBytes = resultReader.read(32);
-            response.txid = index_js_1.Utils.toHex(txidBytes);
+            response.txid = index_js_2.Utils.toHex(txidBytes);
         }
         // Parse tx
         const txFlag = resultReader.readInt8();
@@ -389,7 +389,7 @@ class WalletWireTransceiver {
             response.sendWithResults = [];
             for (let i = 0; i < sendWithResultsLength; i++) {
                 const txidBytes = resultReader.read(32);
-                const txid = index_js_1.Utils.toHex(txidBytes);
+                const txid = index_js_2.Utils.toHex(txidBytes);
                 const statusCode = resultReader.readInt8();
                 let status;
                 if (statusCode === 1)
@@ -404,15 +404,15 @@ class WalletWireTransceiver {
         return response;
     }
     async abortAction(args, originator) {
-        await this.transmit('abortAction', originator, index_js_1.Utils.toArray(args.reference, 'base64'));
+        await this.transmit('abortAction', originator, index_js_2.Utils.toArray(args.reference, 'base64'));
         return { aborted: true };
     }
     async listActions(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         // Serialize labels
         paramWriter.writeVarIntNum(args.labels.length);
         for (const label of args.labels) {
-            const labelBytes = index_js_1.Utils.toArray(label, 'utf8');
+            const labelBytes = index_js_2.Utils.toArray(label, 'utf8');
             paramWriter.writeVarIntNum(labelBytes.length);
             paramWriter.write(labelBytes);
         }
@@ -460,13 +460,13 @@ class WalletWireTransceiver {
         paramWriter.writeInt8(typeof args.seekPermission === 'boolean' ? args.seekPermission ? 1 : 0 : -1);
         // Transmit and parse response
         const result = await this.transmit('listActions', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.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 = index_js_1.Utils.toHex(txidBytes);
+            const txid = index_js_2.Utils.toHex(txidBytes);
             const satoshis = resultReader.readVarIntNum();
             const statusCode = resultReader.readInt8();
             let status;
@@ -498,7 +498,7 @@ class WalletWireTransceiver {
             const isOutgoing = resultReader.readInt8() === 1;
             const descriptionLength = resultReader.readVarIntNum();
             const descriptionBytes = resultReader.read(descriptionLength);
-            const description = index_js_1.Utils.toUTF8(descriptionBytes);
+            const description = index_js_2.Utils.toUTF8(descriptionBytes);
             const action = {
                 txid,
                 satoshis,
@@ -515,7 +515,7 @@ class WalletWireTransceiver {
                 for (let j = 0; j < labelsLength; j++) {
                     const labelLength = resultReader.readVarIntNum();
                     const labelBytes = resultReader.read(labelLength);
-                    action.labels.push(index_js_1.Utils.toUTF8(labelBytes));
+                    action.labels.push(index_js_2.Utils.toUTF8(labelBytes));
                 }
             }
             // Parse version and lockTime
@@ -533,19 +533,19 @@ class WalletWireTransceiver {
                     let sourceLockingScript;
                     if (sourceLockingScriptLength >= 0) {
                         const sourceLockingScriptBytes = resultReader.read(sourceLockingScriptLength);
-                        sourceLockingScript = index_js_1.Utils.toHex(sourceLockingScriptBytes);
+                        sourceLockingScript = index_js_2.Utils.toHex(sourceLockingScriptBytes);
                     }
                     // unlockingScript
                     const unlockingScriptLength = resultReader.readVarIntNum();
                     let unlockingScript;
                     if (unlockingScriptLength >= 0) {
                         const unlockingScriptBytes = resultReader.read(unlockingScriptLength);
-                        unlockingScript = index_js_1.Utils.toHex(unlockingScriptBytes);
+                        unlockingScript = index_js_2.Utils.toHex(unlockingScriptBytes);
                     }
                     // inputDescription
                     const inputDescriptionLength = resultReader.readVarIntNum();
                     const inputDescriptionBytes = resultReader.read(inputDescriptionLength);
-                    const inputDescription = index_js_1.Utils.toUTF8(inputDescriptionBytes);
+                    const inputDescription = index_js_2.Utils.toUTF8(inputDescriptionBytes);
                     // sequenceNumber
                     const sequenceNumber = resultReader.readVarIntNum();
                     action.inputs.push({
@@ -570,19 +570,19 @@ class WalletWireTransceiver {
                     let lockingScript;
                     if (lockingScriptLength >= 0) {
                         const lockingScriptBytes = resultReader.read(lockingScriptLength);
-                        lockingScript = index_js_1.Utils.toHex(lockingScriptBytes);
+                        lockingScript = index_js_2.Utils.toHex(lockingScriptBytes);
                     }
                     const spendable = resultReader.readInt8() === 1;
                     // outputDescription
                     const outputDescriptionLength = resultReader.readVarIntNum();
                     const outputDescriptionBytes = resultReader.read(outputDescriptionLength);
-                    const outputDescription = index_js_1.Utils.toUTF8(outputDescriptionBytes);
+                    const outputDescription = index_js_2.Utils.toUTF8(outputDescriptionBytes);
                     // basket
                     const basketLength = resultReader.readVarIntNum();
                     let basket;
                     if (basketLength >= 0) {
                         const basketBytes = resultReader.read(basketLength);
-                        basket = index_js_1.Utils.toUTF8(basketBytes);
+                        basket = index_js_2.Utils.toUTF8(basketBytes);
                     }
                     // tags
                     const tagsLength = resultReader.readVarIntNum();
@@ -591,7 +591,7 @@ class WalletWireTransceiver {
                         for (let m = 0; m < tagsLength; m++) {
                             const tagLength = resultReader.readVarIntNum();
                             const tagBytes = resultReader.read(tagLength);
-                            tags.push(index_js_1.Utils.toUTF8(tagBytes));
+                            tags.push(index_js_2.Utils.toUTF8(tagBytes));
                         }
                     }
                     // customInstructions
@@ -599,7 +599,7 @@ class WalletWireTransceiver {
                     let customInstructions;
                     if (customInstructionsLength >= 0) {
                         const customInstructionsBytes = resultReader.read(customInstructionsLength);
-                        customInstructions = index_js_1.Utils.toUTF8(customInstructionsBytes);
+                        customInstructions = index_js_2.Utils.toUTF8(customInstructionsBytes);
                     }
                     action.outputs.push({
                         outputIndex,
@@ -621,7 +621,7 @@ class WalletWireTransceiver {
         };
     }
     async internalizeAction(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.writeVarIntNum(args.tx.length);
         paramWriter.write(args.tx);
         paramWriter.writeVarIntNum(args.outputs.length);
@@ -629,21 +629,21 @@ class WalletWireTransceiver {
             paramWriter.writeVarIntNum(out.outputIndex);
             if (out.protocol === 'wallet payment') {
                 paramWriter.writeUInt8(1);
-                paramWriter.write(index_js_1.Utils.toArray(out.paymentRemittance.senderIdentityKey, 'hex'));
-                const derivationPrefixAsArray = index_js_1.Utils.toArray(out.paymentRemittance.derivationPrefix, 'base64');
+                paramWriter.write(index_js_2.Utils.toArray(out.paymentRemittance.senderIdentityKey, 'hex'));
+                const derivationPrefixAsArray = index_js_2.Utils.toArray(out.paymentRemittance.derivationPrefix, 'base64');
                 paramWriter.writeVarIntNum(derivationPrefixAsArray.length);
                 paramWriter.write(derivationPrefixAsArray);
-                const derivationSuffixAsArray = index_js_1.Utils.toArray(out.paymentRemittance.derivationSuffix, 'base64');
+                const derivationSuffixAsArray = index_js_2.Utils.toArray(out.paymentRemittance.derivationSuffix, 'base64');
                 paramWriter.writeVarIntNum(derivationSuffixAsArray.length);
                 paramWriter.write(derivationSuffixAsArray);
             }
             else {
                 paramWriter.writeUInt8(2);
-                const basketAsArray = index_js_1.Utils.toArray(out.insertionRemittance.basket, 'utf8');
+                const basketAsArray = index_js_2.Utils.toArray(out.insertionRemittance.basket, 'utf8');
                 paramWriter.writeVarIntNum(basketAsArray.length);
                 paramWriter.write(basketAsArray);
                 if (typeof out.insertionRemittance.customInstructions) {
-                    const customInstructionsAsArray = index_js_1.Utils.toArray(out.insertionRemittance.customInstructions, 'utf8');
+                    const customInstructionsAsArray = index_js_2.Utils.toArray(out.insertionRemittance.customInstructions, 'utf8');
                     paramWriter.writeVarIntNum(customInstructionsAsArray.length);
                     paramWriter.write(customInstructionsAsArray);
                 }
@@ -653,7 +653,7 @@ class WalletWireTransceiver {
                 if (typeof out.insertionRemittance.tags === 'object') {
                     paramWriter.writeVarIntNum(out.insertionRemittance.tags.length);
                     for (const tag of out.insertionRemittance.tags) {
-                        const tagAsArray = index_js_1.Utils.toArray(tag, 'utf8');
+                        const tagAsArray = index_js_2.Utils.toArray(tag, 'utf8');
                         paramWriter.writeVarIntNum(tagAsArray.length);
                         paramWriter.write(tagAsArray);
                     }
@@ -666,7 +666,7 @@ class WalletWireTransceiver {
         if (typeof args.labels === 'object') {
             paramWriter.writeVarIntNum(args.labels.length);
             for (const l of args.labels) {
-                const labelAsArray = index_js_1.Utils.toArray(l, 'utf8');
+                const labelAsArray = index_js_2.Utils.toArray(l, 'utf8');
                 paramWriter.writeVarIntNum(labelAsArray.length);
                 paramWriter.write(labelAsArray);
             }
@@ -674,7 +674,7 @@ class WalletWireTransceiver {
         else {
             paramWriter.writeVarIntNum(-1);
         }
-        const descriptionAsArray = index_js_1.Utils.toArray(args.description);
+        const descriptionAsArray = index_js_2.Utils.toArray(args.description);
         paramWriter.writeVarIntNum(descriptionAsArray.length);
         paramWriter.write(descriptionAsArray);
         // Serialize seekPermission
@@ -683,14 +683,14 @@ class WalletWireTransceiver {
         return { accepted: true };
     }
     async listOutputs(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
-        const basketAsArray = index_js_1.Utils.toArray(args.basket, 'utf8');
+        const paramWriter = new index_js_2.Utils.Writer();
+        const basketAsArray = index_js_2.Utils.toArray(args.basket, 'utf8');
         paramWriter.writeVarIntNum(basketAsArray.length);
         paramWriter.write(basketAsArray);
         if (typeof args.tags === 'object') {
             paramWriter.writeVarIntNum(args.tags.length);
             for (const tag of args.tags) {
-                const tagAsArray = index_js_1.Utils.toArray(tag, 'utf8');
+                const tagAsArray = index_js_2.Utils.toArray(tag, 'utf8');
                 paramWriter.writeVarIntNum(tagAsArray.length);
                 paramWriter.write(tagAsArray);
             }
@@ -749,7 +749,7 @@ class WalletWireTransceiver {
         // Serialize seekPermission
         paramWriter.writeInt8(typeof args.seekPermission === 'boolean' ? args.seekPermission ? 1 : 0 : -1);
         const result = await this.transmit('listOutputs', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const totalOutputs = resultReader.readVarIntNum();
         const beefLength = resultReader.readVarIntNum();
         let BEEF = undefined;
@@ -767,18 +767,18 @@ class WalletWireTransceiver {
             };
             const scriptLength = resultReader.readVarIntNum();
             if (scriptLength >= 0) {
-                output.lockingScript = index_js_1.Utils.toHex(resultReader.read(scriptLength));
+                output.lockingScript = index_js_2.Utils.toHex(resultReader.read(scriptLength));
             }
             const customInstructionsLength = resultReader.readVarIntNum();
             if (customInstructionsLength >= 0) {
-                output.customInstructions = index_js_1.Utils.toUTF8(resultReader.read(customInstructionsLength));
+                output.customInstructions = index_js_2.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(index_js_1.Utils.toUTF8(resultReader.read(tagLength)));
+                    tags.push(index_js_2.Utils.toUTF8(resultReader.read(tagLength)));
                 }
                 output.tags = tags;
             }
@@ -787,7 +787,7 @@ class WalletWireTransceiver {
                 const labels = [];
                 for (let i = 0; i < labelsLength; i++) {
                     const labelLength = resultReader.readVarIntNum();
-                    labels.push(index_js_1.Utils.toUTF8(resultReader.read(labelLength)));
+                    labels.push(index_js_2.Utils.toUTF8(resultReader.read(labelLength)));
                 }
                 output.labels = labels;
             }
@@ -800,8 +800,8 @@ class WalletWireTransceiver {
         };
     }
     async relinquishOutput(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
-        const basketAsArray = index_js_1.Utils.toArray(args.basket, 'utf8');
+        const paramWriter = new index_js_2.Utils.Writer();
+        const basketAsArray = index_js_2.Utils.toArray(args.basket, 'utf8');
         paramWriter.writeVarIntNum(basketAsArray.length);
         paramWriter.write(basketAsArray);
         paramWriter.write(this.encodeOutpoint(args.output));
@@ -809,19 +809,19 @@ class WalletWireTransceiver {
         return { relinquished: true };
     }
     encodeOutpoint(outpoint) {
-        const writer = new index_js_1.Utils.Writer();
+        const writer = new index_js_2.Utils.Writer();
         const [txid, index] = outpoint.split('.');
-        writer.write(index_js_1.Utils.toArray(txid, 'hex'));
+        writer.write(index_js_2.Utils.toArray(txid, 'hex'));
         writer.writeVarIntNum(Number(index));
         return writer.toArray();
     }
     readOutpoint(reader) {
-        const txid = index_js_1.Utils.toHex(reader.read(32));
+        const txid = index_js_2.Utils.toHex(reader.read(32));
         const index = reader.readVarIntNum();
         return `${txid}.${index}`;
     }
     async getPublicKey(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.writeUInt8(args.identityKey ? 1 : 0);
         if (!args.identityKey) {
             paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
@@ -839,21 +839,21 @@ class WalletWireTransceiver {
         paramWriter.writeInt8(typeof args.seekPermission === 'boolean' ? args.seekPermission ? 1 : 0 : -1);
         const result = await this.transmit('getPublicKey', originator, paramWriter.toArray());
         return {
-            publicKey: index_js_1.Utils.toHex(result)
+            publicKey: index_js_2.Utils.toHex(result)
         };
     }
     async revealCounterpartyKeyLinkage(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodePrivilegedParams(args.privileged, args.privilegedReason));
-        paramWriter.write(index_js_1.Utils.toArray(args.counterparty, 'hex'));
-        paramWriter.write(index_js_1.Utils.toArray(args.verifier, 'hex'));
+        paramWriter.write(index_js_2.Utils.toArray(args.counterparty, 'hex'));
+        paramWriter.write(index_js_2.Utils.toArray(args.verifier, 'hex'));
         const result = await this.transmit('revealCounterpartyKeyLinkage', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
-        const prover = index_js_1.Utils.toHex(resultReader.read(33));
-        const verifier = index_js_1.Utils.toHex(resultReader.read(33));
-        const counterparty = index_js_1.Utils.toHex(resultReader.read(33));
+        const resultReader = new index_js_2.Utils.Reader(result);
+        const prover = index_js_2.Utils.toHex(resultReader.read(33));
+        const verifier = index_js_2.Utils.toHex(resultReader.read(33));
+        const counterparty = index_js_2.Utils.toHex(resultReader.read(33));
         const revelationTimeLength = resultReader.readVarIntNum();
-        const revelationTime = index_js_1.Utils.toUTF8(resultReader.read(revelationTimeLength));
+        const revelationTime = index_js_2.Utils.toUTF8(resultReader.read(revelationTimeLength));
         const encryptedLinkageLength = resultReader.readVarIntNum();
         const encryptedLinkage = resultReader.read(encryptedLinkageLength);
         const encryptedLinkageProofLength = resultReader.readVarIntNum();
@@ -868,19 +868,19 @@ class WalletWireTransceiver {
         };
     }
     async revealSpecificKeyLinkage(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
-        paramWriter.write(index_js_1.Utils.toArray(args.verifier, 'hex'));
+        paramWriter.write(index_js_2.Utils.toArray(args.verifier, 'hex'));
         const result = await this.transmit('revealSpecificKeyLinkage', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
-        const prover = index_js_1.Utils.toHex(resultReader.read(33));
-        const verifier = index_js_1.Utils.toHex(resultReader.read(33));
-        const counterparty = index_js_1.Utils.toHex(resultReader.read(33));
+        const resultReader = new index_js_2.Utils.Reader(result);
+        const prover = index_js_2.Utils.toHex(resultReader.read(33));
+        const verifier = index_js_2.Utils.toHex(resultReader.read(33));
+        const counterparty = index_js_2.Utils.toHex(resultReader.read(33));
         const securityLevel = resultReader.readUInt8();
         const protocolLength = resultReader.readVarIntNum();
-        const protocol = index_js_1.Utils.toUTF8(resultReader.read(protocolLength));
+        const protocol = index_js_2.Utils.toUTF8(resultReader.read(protocolLength));
         const keyIDLength = resultReader.readVarIntNum();
-        const keyID = index_js_1.Utils.toUTF8(resultReader.read(keyIDLength));
+        const keyID = index_js_2.Utils.toUTF8(resultReader.read(keyIDLength));
         const encryptedLinkageLength = resultReader.readVarIntNum();
         const encryptedLinkage = resultReader.read(encryptedLinkageLength);
         const encryptedLinkageProofLength = resultReader.readVarIntNum();
@@ -898,7 +898,7 @@ class WalletWireTransceiver {
         };
     }
     async encrypt(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
         paramWriter.writeVarIntNum(args.plaintext.length);
         paramWriter.write(args.plaintext);
@@ -909,7 +909,7 @@ class WalletWireTransceiver {
         };
     }
     async decrypt(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
         paramWriter.writeVarIntNum(args.ciphertext.length);
         paramWriter.write(args.ciphertext);
@@ -920,7 +920,7 @@ class WalletWireTransceiver {
         };
     }
     async createHmac(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
         paramWriter.writeVarIntNum(args.data.length);
         paramWriter.write(args.data);
@@ -931,7 +931,7 @@ class WalletWireTransceiver {
         };
     }
     async verifyHmac(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
         paramWriter.write(args.hmac);
         paramWriter.writeVarIntNum(args.data.length);
@@ -942,7 +942,7 @@ class WalletWireTransceiver {
         return { valid: true };
     }
     async createSignature(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.write(this.encodeKeyRelatedParams(args.protocolID, args.keyID, args.counterparty, args.privileged, args.privilegedReason));
         if (typeof args.data === 'object') {
             paramWriter.writeUInt8(1);
@@ -960,7 +960,7 @@ class WalletWireTransceiver {
         };
     }
     async verifySignature(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         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);
@@ -985,12 +985,12 @@ class WalletWireTransceiver {
         return { valid: true };
     }
     encodeKeyRelatedParams(protocolID, keyID, counterparty, privileged, privilegedReason) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.writeUInt8(protocolID[0]);
-        const protocolAsArray = index_js_1.Utils.toArray(protocolID[1], 'utf8');
+        const protocolAsArray = index_js_2.Utils.toArray(protocolID[1], 'utf8');
         paramWriter.writeVarIntNum(protocolAsArray.length);
         paramWriter.write(protocolAsArray);
-        const keyIDAsArray = index_js_1.Utils.toArray(keyID, 'utf8');
+        const keyIDAsArray = index_js_2.Utils.toArray(keyID, 'utf8');
         paramWriter.writeVarIntNum(keyIDAsArray.length);
         paramWriter.write(keyIDAsArray);
         if (typeof counterparty !== 'string') {
@@ -1003,20 +1003,20 @@ class WalletWireTransceiver {
             paramWriter.writeUInt8(12);
         }
         else {
-            paramWriter.write(index_js_1.Utils.toArray(counterparty, 'hex'));
+            paramWriter.write(index_js_2.Utils.toArray(counterparty, 'hex'));
         }
         paramWriter.write(this.encodePrivilegedParams(privileged, privilegedReason));
         return paramWriter.toArray();
     }
     async acquireCertificate(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
-        paramWriter.write(index_js_1.Utils.toArray(args.type, 'base64'));
-        paramWriter.write(index_js_1.Utils.toArray(args.certifier, 'hex'));
+        const paramWriter = new index_js_2.Utils.Writer();
+        paramWriter.write(index_js_2.Utils.toArray(args.type, 'base64'));
+        paramWriter.write(index_js_2.Utils.toArray(args.certifier, 'hex'));
         const fieldEntries = Object.entries(args.fields);
         paramWriter.writeVarIntNum(fieldEntries.length);
         for (const [key, value] of fieldEntries) {
-            const keyAsArray = index_js_1.Utils.toArray(key, 'utf8');
-            const valueAsArray = index_js_1.Utils.toArray(value, 'utf8');
+            const keyAsArray = index_js_2.Utils.toArray(key, 'utf8');
+            const valueAsArray = index_js_2.Utils.toArray(value, 'utf8');
             paramWriter.writeVarIntNum(keyAsArray.length);
             paramWriter.write(keyAsArray);
             paramWriter.writeVarIntNum(valueAsArray.length);
@@ -1025,40 +1025,40 @@ class WalletWireTransceiver {
         paramWriter.write(this.encodePrivilegedParams(args.privileged, args.privilegedReason));
         paramWriter.writeUInt8(args.acquisitionProtocol === 'direct' ? 1 : 2);
         if (args.acquisitionProtocol === 'direct') {
-            paramWriter.write(index_js_1.Utils.toArray(args.serialNumber, 'base64'));
+            paramWriter.write(index_js_2.Utils.toArray(args.serialNumber, 'base64'));
             paramWriter.write(this.encodeOutpoint(args.revocationOutpoint));
-            const signatureAsArray = index_js_1.Utils.toArray(args.signature, 'hex');
+            const signatureAsArray = index_js_2.Utils.toArray(args.signature, 'hex');
             paramWriter.writeVarIntNum(signatureAsArray.length);
             paramWriter.write(signatureAsArray);
             const keyringRevealerAsArray = args.keyringRevealer !== 'certifier'
-                ? index_js_1.Utils.toArray(args.keyringRevealer, 'hex')
+                ? index_js_2.Utils.toArray(args.keyringRevealer, 'hex')
                 : [11];
             paramWriter.write(keyringRevealerAsArray);
             const keyringKeys = Object.keys(args.keyringForSubject);
             paramWriter.writeVarIntNum(keyringKeys.length);
             for (let i = 0; i < keyringKeys.length; i++) {
-                const keyringKeysAsArray = index_js_1.Utils.toArray(keyringKeys[i], 'utf8');
+                const keyringKeysAsArray = index_js_2.Utils.toArray(keyringKeys[i], 'utf8');
                 paramWriter.writeVarIntNum(keyringKeysAsArray.length);
                 paramWriter.write(keyringKeysAsArray);
-                const keyringForSubjectAsArray = index_js_1.Utils.toArray(args.keyringForSubject[keyringKeys[i]], 'base64');
+                const keyringForSubjectAsArray = index_js_2.Utils.toArray(args.keyringForSubject[keyringKeys[i]], 'base64');
                 paramWriter.writeVarIntNum(keyringForSubjectAsArray.length);
                 paramWriter.write(keyringForSubjectAsArray);
             }
         }
         else {
-            const certifierUrlAsArray = index_js_1.Utils.toArray(args.certifierUrl, 'utf8');
+            const certifierUrlAsArray = index_js_2.Utils.toArray(args.certifierUrl, 'utf8');
             paramWriter.writeVarIntNum(certifierUrlAsArray.length);
             paramWriter.write(certifierUrlAsArray);
         }
         const result = await this.transmit('acquireCertificate', originator, paramWriter.toArray());
-        const cert = Certificate_js_1.default.fromBin(result);
+        const cert = index_js_1.Certificate.fromBin(result);
         return {
             ...cert,
             signature: cert.signature
         };
     }
     encodePrivilegedParams(privileged, privilegedReason) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         if (typeof privileged === 'boolean') {
             paramWriter.writeInt8(privileged ? 1 : 0);
         }
@@ -1066,7 +1066,7 @@ class WalletWireTransceiver {
             paramWriter.writeInt8(-1);
         }
         if (typeof privilegedReason === 'string') {
-            const privilegedReasonAsArray = index_js_1.Utils.toArray(privilegedReason, 'utf8');
+            const privilegedReasonAsArray = index_js_2.Utils.toArray(privilegedReason, 'utf8');
             paramWriter.writeInt8(privilegedReasonAsArray.length);
             paramWriter.write(privilegedReasonAsArray);
         }
@@ -1076,14 +1076,14 @@ class WalletWireTransceiver {
         return paramWriter.toArray();
     }
     async listCertificates(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.writeVarIntNum(args.certifiers.length);
         for (let i = 0; i < args.certifiers.length; i++) {
-            paramWriter.write(index_js_1.Utils.toArray(args.certifiers[i], 'hex'));
+            paramWriter.write(index_js_2.Utils.toArray(args.certifiers[i], 'hex'));
         }
         paramWriter.writeVarIntNum(args.types.length);
         for (let i = 0; i < args.types.length; i++) {
-            paramWriter.write(index_js_1.Utils.toArray(args.types[i], 'base64'));
+            paramWriter.write(index_js_2.Utils.toArray(args.types[i], 'base64'));
         }
         if (typeof args.limit === 'number') {
             paramWriter.writeVarIntNum(args.limit);
@@ -1099,13 +1099,13 @@ class WalletWireTransceiver {
         }
         paramWriter.write(this.encodePrivilegedParams(args.privileged, args.privilegedReason));
         const result = await this.transmit('listCertificates', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const totalCertificates = resultReader.readVarIntNum();
         const certificates = [];
         for (let i = 0; i < totalCertificates; i++) {
             const certificateLength = resultReader.readVarIntNum();
             const certificateBin = resultReader.read(certificateLength);
-            const cert = Certificate_js_1.default.fromBin(certificateBin);
+            const cert = index_js_1.Certificate.fromBin(certificateBin);
             certificates.push({
                 ...cert,
                 signature: cert.signature
@@ -1117,25 +1117,25 @@ class WalletWireTransceiver {
         };
     }
     async proveCertificate(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
-        const typeAsArray = index_js_1.Utils.toArray(args.certificate.type, 'base64');
+        const paramWriter = new index_js_2.Utils.Writer();
+        const typeAsArray = index_js_2.Utils.toArray(args.certificate.type, 'base64');
         paramWriter.write(typeAsArray);
-        const subjectAsArray = index_js_1.Utils.toArray(args.certificate.subject, 'hex');
+        const subjectAsArray = index_js_2.Utils.toArray(args.certificate.subject, 'hex');
         paramWriter.write(subjectAsArray);
-        const serialNumberAsArray = index_js_1.Utils.toArray(args.certificate.serialNumber, 'base64');
+        const serialNumberAsArray = index_js_2.Utils.toArray(args.certificate.serialNumber, 'base64');
         paramWriter.write(serialNumberAsArray);
-        const certifierAsArray = index_js_1.Utils.toArray(args.certificate.certifier, 'hex');
+        const certifierAsArray = index_js_2.Utils.toArray(args.certificate.certifier, 'hex');
         paramWriter.write(certifierAsArray);
         const revocationOutpointAsArray = this.encodeOutpoint(args.certificate.revocationOutpoint);
         paramWriter.write(revocationOutpointAsArray);
-        const signatureAsArray = index_js_1.Utils.toArray(args.certificate.signature, 'hex');
+        const signatureAsArray = index_js_2.Utils.toArray(args.certificate.signature, 'hex');
         paramWriter.writeVarIntNum(signatureAsArray.length);
         paramWriter.write(signatureAsArray);
         const fieldEntries = Object.entries(args.certificate.fields);
         paramWriter.writeVarIntNum(fieldEntries.length);
         for (const [key, value] of fieldEntries) {
-            const keyAsArray = index_js_1.Utils.toArray(key, 'utf8');
-            const valueAsArray = index_js_1.Utils.toArray(value, 'utf8');
+            const keyAsArray = index_js_2.Utils.toArray(key, 'utf8');
+            const valueAsArray = index_js_2.Utils.toArray(value, 'utf8');
             paramWriter.writeVarIntNum(keyAsArray.length);
             paramWriter.write(keyAsArray);
             paramWriter.writeVarIntNum(valueAsArray.length);
@@ -1143,57 +1143,57 @@ class WalletWireTransceiver {
         }
         paramWriter.writeVarIntNum(args.fieldsToReveal.length);
         for (const field of args.fieldsToReveal) {
-            const fieldAsArray = index_js_1.Utils.toArray(field, 'utf8');
+            const fieldAsArray = index_js_2.Utils.toArray(field, 'utf8');
             paramWriter.writeVarIntNum(fieldAsArray.length);
             paramWriter.write(fieldAsArray);
         }
-        paramWriter.write(index_js_1.Utils.toArray(args.verifier, 'hex'));
+        paramWriter.write(index_js_2.Utils.toArray(args.verifier, 'hex'));
         paramWriter.write(this.encodePrivilegedParams(args.privileged, args.privilegedReason));
         const result = await this.transmit('proveCertificate', originator, paramWriter.toArray());
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const numFields = resultReader.readVarIntNum();
         const keyringForVerifier = {};
         for (let i = 0; i < numFields; i++) {
             const fieldKeyLength = resultReader.readVarIntNum();
-            const fieldKey = index_js_1.Utils.toUTF8(resultReader.read(fieldKeyLength));
+            const fieldKey = index_js_2.Utils.toUTF8(resultReader.read(fieldKeyLength));
             const fieldValueLength = resultReader.readVarIntNum();
-            keyringForVerifier[fieldKey] = index_js_1.Utils.toBase64(resultReader.read(fieldValueLength));
+            keyringForVerifier[fieldKey] = index_js_2.Utils.toBase64(resultReader.read(fieldValueLength));
         }
         return {
             keyringForVerifier
         };
     }
     async relinquishCertificate(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
-        const typeAsArray = index_js_1.Utils.toArray(args.type, 'base64');
+        const paramWriter = new index_js_2.Utils.Writer();
+        const typeAsArray = index_js_2.Utils.toArray(args.type, 'base64');
         paramWriter.write(typeAsArray);
-        const serialNumberAsArray = index_js_1.Utils.toArray(args.serialNumber, 'base64');
+        const serialNumberAsArray = index_js_2.Utils.toArray(args.serialNumber, 'base64');
         paramWriter.write(serialNumberAsArray);
-        const certifierAsArray = index_js_1.Utils.toArray(args.certifier, 'hex');
+        const certifierAsArray = index_js_2.Utils.toArray(args.certifier, 'hex');
         paramWriter.write(certifierAsArray);
         await this.transmit('relinquishCertificate', originator, paramWriter.toArray());
         return { relinquished: true };
     }
     parseDiscoveryResult(result) {
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         const totalCertificates = resultReader.readVarIntNum();
         const certificates = [];
         for (let i = 0; i < totalCertificates; i++) {
             const certBinLen = resultReader.readVarIntNum();
             const certBin = resultReader.read(certBinLen);
-            const cert = Certificate_js_1.default.fromBin(certBin);
+            const cert = index_js_1.Certificate.fromBin(certBin);
             const nameLength = resultReader.readVarIntNum();
-            const name = index_js_1.Utils.toUTF8(resultReader.read(nameLength));
+            const name = index_js_2.Utils.toUTF8(resultReader.read(nameLength));
             const iconUrlLength = resultReader.readVarIntNum();
-            const iconUrl = index_js_1.Utils.toUTF8(resultReader.read(iconUrlLength));
+            const iconUrl = index_js_2.Utils.toUTF8(resultReader.read(iconUrlLength));
             const descriptionLength = resultReader.readVarIntNum();
-            const description = index_js_1.Utils.toUTF8(resultReader.read(descriptionLength));
+            const description = index_js_2.Utils.toUTF8(resultReader.read(descriptionLength));
             const trust = resultReader.readUInt8();
             const publiclyRevealedKeyring = {};
             const numPublicKeyringEntries = resultReader.readVarIntNum();
             for (let j = 0; j < numPublicKeyringEntries; j++) {
                 const fieldKeyLen = resultReader.readVarIntNum();
-                const fieldKey = index_js_1.Utils.toUTF8(resultReader.read(fieldKeyLen));
+                const fieldKey = index_js_2.Utils.toUTF8(resultReader.read(fieldKeyLen));
                 const fieldValueLen = resultReader.readVarIntNum();
                 publiclyRevealedKeyring[fieldKey] = resultReader.read(fieldValueLen);
             }
@@ -1201,9 +1201,9 @@ class WalletWireTransceiver {
             const numDecryptedFields = resultReader.readVarIntNum();
             for (let k = 0; k < numDecryptedFields; k++) {
                 const fieldKeyLen = resultReader.readVarIntNum();
-                const fieldKey = index_js_1.Utils.toUTF8(resultReader.read(fieldKeyLen));
+                const fieldKey = index_js_2.Utils.toUTF8(resultReader.read(fieldKeyLen));
                 const fieldValueLen = resultReader.readVarIntNum();
-                decryptedFields[fieldKey] = index_js_1.Utils.toUTF8(resultReader.read(fieldValueLen));
+                decryptedFields[fieldKey] = index_js_2.Utils.toUTF8(resultReader.read(fieldValueLen));
             }
             certificates.push({
                 ...cert,
@@ -1219,8 +1219,8 @@ class WalletWireTransceiver {
         };
     }
     async discoverByIdentityKey(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
-        paramWriter.write(index_js_1.Utils.toArray(args.identityKey, 'hex'));
+        const paramWriter = new index_js_2.Utils.Writer();
+        paramWriter.write(index_js_2.Utils.toArray(args.identityKey, 'hex'));
         if (typeof args.limit === 'number') {
             paramWriter.writeVarIntNum(args.limit);
         }
@@ -1239,14 +1239,14 @@ class WalletWireTransceiver {
         return this.parseDiscoveryResult(result);
     }
     async discoverByAttributes(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.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(index_js_1.Utils.toArray(attributeKeys[i], 'utf8'));
+            paramWriter.write(index_js_2.Utils.toArray(attributeKeys[i], 'utf8'));
             paramWriter.writeVarIntNum(args.attributes[attributeKeys[i]].length);
-            paramWriter.write(index_js_1.Utils.toArray(args.attributes[attributeKeys[i]], 'utf8'));
+            paramWriter.write(index_js_2.Utils.toArray(args.attributes[attributeKeys[i]], 'utf8'));
         }
         if (typeof args.limit === 'number') {
             paramWriter.writeVarIntNum(args.limit);
@@ -1275,17 +1275,17 @@ class WalletWireTransceiver {
     }
     async getHeight(args, originator) {
         const result = await this.transmit('getHeight', originator);
-        const resultReader = new index_js_1.Utils.Reader(result);
+        const resultReader = new index_js_2.Utils.Reader(result);
         return {
             height: resultReader.readVarIntNum()
         };
     }
     async getHeaderForHeight(args, originator) {
-        const paramWriter = new index_js_1.Utils.Writer();
+        const paramWriter = new index_js_2.Utils.Writer();
         paramWriter.writeVarIntNum(args.height);
         const header = await this.transmit('getHeaderForHeight', originator, paramWriter.toArray());
         return {
-            header: index_js_1.Utils.toHex(header)
+            header: index_js_2.Utils.toHex(header)
         };
     }
     async getNetwork(args, originator) {
@@ -1297,7 +1297,7 @@ class WalletWireTransceiver {
     async getVersion(args, originator) {
         const version = await this.transmit('getVersion', originator);
         return {
-            version: index_js_1.Utils.toUTF8(version)
+            version: index_js_2.Utils.toUTF8(version)
         };
     }
 }