@stacks/storage 4.3.8-pr.cfa2bdc.0 → 4.3.8-pr.e7792d1.0

package/dist/esm/fileContentLoader.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="node" />
-export declare type PutFileContent = string | Buffer | ArrayBufferView | ArrayBufferLike | Blob;
+export declare type PutFileContent = string | Uint8Array | ArrayBufferView | ArrayBufferLike | Blob;
 export declare class FileContentLoader {
-    readonly content: Buffer | Blob;
+    readonly content: Uint8Array | Blob;
     readonly wasString: boolean;
     readonly contentType: string;
     readonly contentByteLength: number;
@@ -12,5 +11,5 @@ export declare class FileContentLoader {
     private detectContentType;
     private detectContentLength;
     private loadContent;
-    load(): Promise<Buffer | string>;
+    load(): Promise<Uint8Array | string>;
 }

package/dist/esm/fileContentLoader.js

@@ -1,4 +1,4 @@
-import { Buffer } from '@stacks/common';
+import { utf8ToBytes } from '@stacks/common';
 export class FileContentLoader {
     constructor(content, contentType) {
         this.wasString = typeof content === 'string';
@@ -17,28 +17,28 @@ export class FileContentLoader {
                 }
                 if (typeof TextEncoder !== 'undefined') {
                     const encodedString = new TextEncoder().encode(content);
-                    return Buffer.from(encodedString.buffer);
+                    return new Uint8Array(encodedString.buffer);
                 }
-                return Buffer.from(content);
+                return utf8ToBytes(content);
             }
-            else if (Buffer.isBuffer(content)) {
+            else if (content instanceof Uint8Array) {
                 return content;
             }
             else if (ArrayBuffer.isView(content)) {
-                return Buffer.from(content.buffer, content.byteOffset, content.byteLength);
+                return new Uint8Array(content.buffer.slice(content.byteOffset, content.byteOffset + content.byteLength));
             }
             else if (typeof Blob !== 'undefined' && content instanceof Blob) {
                 return content;
             }
             else if (typeof ArrayBuffer !== 'undefined' && content instanceof ArrayBuffer) {
-                return Buffer.from(content);
+                return new Uint8Array(content);
             }
             else if (Array.isArray(content)) {
                 if (content.length > 0 &&
                     (!Number.isInteger(content[0]) || content[0] < 0 || content[0] > 255)) {
                     throw new Error(`Unexpected array values provided as file data: value "${content[0]}" at index 0 is not an octet number. ${this.supportedTypesMsg}`);
                 }
-                return Buffer.from(content);
+                return new Uint8Array(content);
             }
             else {
                 const typeName = Object.prototype.toString.call(content);
@@ -62,7 +62,7 @@ export class FileContentLoader {
         }
     }
     detectContentLength() {
-        if (ArrayBuffer.isView(this.content) || Buffer.isBuffer(this.content)) {
+        if (ArrayBuffer.isView(this.content) || this.content instanceof Uint8Array) {
             return this.content.byteLength;
         }
         else if (typeof Blob !== 'undefined' && this.content instanceof Blob) {
@@ -75,11 +75,11 @@ export class FileContentLoader {
     }
     async loadContent() {
         try {
-            if (Buffer.isBuffer(this.content)) {
+            if (this.content instanceof Uint8Array) {
                 return this.content;
             }
             else if (ArrayBuffer.isView(this.content)) {
-                return Buffer.from(this.content.buffer, this.content.byteOffset, this.content.byteLength);
+                return new Uint8Array(this.content.buffer, this.content.byteOffset, this.content.byteLength);
             }
             else if (typeof Blob !== 'undefined' && this.content instanceof Blob) {
                 const reader = new FileReader();
@@ -89,12 +89,11 @@ export class FileContentLoader {
                     };
                     reader.onload = () => {
                         const arrayBuffer = reader.result;
-                        resolve(Buffer.from(arrayBuffer));
+                        resolve(new Uint8Array(arrayBuffer));
                     };
                     reader.readAsArrayBuffer(this.content);
                 });
-                const result = await readPromise;
-                return result;
+                return await readPromise;
             }
             else {
                 const typeName = Object.prototype.toString.call(this.content);
@@ -116,5 +115,5 @@ export class FileContentLoader {
     }
 }
 FileContentLoader.supportedTypesMsg = 'Supported types are: `string` (to be UTF8 encoded), ' +
-    '`Buffer`, `Blob`, `File`, `ArrayBuffer`, `UInt8Array` or any other typed array buffer. ';
+    '`Blob`, `File`, `ArrayBuffer`, `UInt8Array` or any other typed array buffer. ';
 //# sourceMappingURL=fileContentLoader.js.map

package/dist/esm/fileContentLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileContentLoader.js","sourceRoot":"","sources":["../../src/fileContentLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fileContentLoader.js","sourceRoot":"","sources":["../../src/fileContentLoader.ts"],"names":[],"mappings":"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"}

package/dist/esm/hub.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FetchFn } from '@stacks/network';
 export declare const BLOCKSTACK_GAIA_HUB_LABEL = "blockstack-gaia-hub-config";
 export interface GaiaHubConfig {
@@ -12,7 +11,7 @@ interface UploadResponse {
     publicURL: string;
     etag?: string;
 }
-export declare function uploadToGaiaHub(filename: string, contents: Blob | Buffer | ArrayBufferView | string, hubConfig: GaiaHubConfig, contentType?: string, newFile?: boolean, etag?: string, dangerouslyIgnoreEtag?: boolean, fetchFn?: FetchFn): Promise<UploadResponse>;
+export declare function uploadToGaiaHub(filename: string, contents: Blob | Uint8Array | ArrayBufferView | string, hubConfig: GaiaHubConfig, contentType?: string, newFile?: boolean, etag?: string, dangerouslyIgnoreEtag?: boolean, fetchFn?: FetchFn): Promise<UploadResponse>;
 export declare function deleteFromGaiaHub(filename: string, hubConfig: GaiaHubConfig, fetchFn?: FetchFn): Promise<void>;
 export declare function getFullReadUrl(filename: string, hubConfig: GaiaHubConfig): Promise<string>;
 export declare function connectToGaiaHub(gaiaHubUrl: string, challengeSignerHex: string, associationToken?: string, fetchFn?: FetchFn): Promise<GaiaHubConfig>;

package/dist/esm/hub.js

@@ -1,6 +1,7 @@
-import { BadPathError, Buffer, ConflictError, DoesNotExist, Logger, megabytesToBytes, NotEnoughProofError, PayloadTooLargeError, PreconditionFailedError, ValidationError, } from '@stacks/common';
+import { BadPathError, bytesToHex, ConflictError, DoesNotExist, Logger, megabytesToBytes, NotEnoughProofError, PayloadTooLargeError, PreconditionFailedError, utf8ToBytes, ValidationError, } from '@stacks/common';
 import { compressPrivateKey, ecSign, getPublicKeyFromPrivate, hashSha256Sync, publicKeyToAddress, randomBytes, Signature, } from '@stacks/encryption';
 import { createFetchFn } from '@stacks/network';
+import { fromByteArray } from 'base64-js';
 import { TokenSigner } from 'jsontokens';
 export const BLOCKSTACK_GAIA_HUB_LABEL = 'blockstack-gaia-hub-config';
 export async function uploadToGaiaHub(filename, contents, hubConfig, contentType = 'application/octet-stream', newFile = true, etag, dangerouslyIgnoreEtag, fetchFn = createFetchFn()) {
@@ -52,16 +53,14 @@ function makeLegacyAuthToken(challengeText, signerKeyHex) {
         throw new Error('Failed in parsing legacy challenge text from the gaia hub.');
     }
     if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
-        const digest = hashSha256Sync(Buffer.from(challengeText));
-        const signatureBuffer = ecSign(digest, compressPrivateKey(signerKeyHex));
-        const signature = Signature.fromCompact(signatureBuffer.toString('hex')).toDERHex();
+        const digest = hashSha256Sync(utf8ToBytes(challengeText));
+        const signatureBytes = ecSign(digest, compressPrivateKey(signerKeyHex));
+        const signature = Signature.fromCompact(bytesToHex(signatureBytes)).toDERHex();
         const publickey = getPublicKeyFromPrivate(signerKeyHex);
-        const token = Buffer.from(JSON.stringify({ publickey, signature })).toString('base64');
+        const token = fromByteArray(utf8ToBytes(JSON.stringify({ publickey, signature })));
         return token;
     }
-    else {
-        throw new Error('Failed to connect to legacy gaia hub. If you operate this hub, please update.');
-    }
+    throw new Error('Failed to connect to legacy gaia hub. If you operate this hub, please update.');
 }
 function makeV1GaiaAuthToken(hubInfo, signerKeyHex, hubUrl, associationToken) {
     const challengeText = hubInfo.challenge_text;
@@ -70,7 +69,7 @@ function makeV1GaiaAuthToken(hubInfo, signerKeyHex, hubUrl, associationToken) {
     if (!handlesV1Auth) {
         return makeLegacyAuthToken(challengeText, signerKeyHex);
     }
-    const salt = randomBytes(16).toString('hex');
+    const salt = bytesToHex(randomBytes(16));
     const payload = {
         gaiaChallenge: challengeText,
         hubUrl,

package/dist/esm/hub.js.map

@@ -1 +1 @@
-{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/hub.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/hub.ts"],"names":[],"mappings":"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"}

package/dist/esm/storage.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { UserSession } from '@stacks/auth';
 import { EncryptionOptions } from '@stacks/encryption';
 import { FetchFn } from '@stacks/network';
@@ -29,8 +28,8 @@ export declare class Storage {
     getFileUrl(path: string, options?: GetFileUrlOptions): Promise<string>;
     getFileContents(path: string, app: string, username: string | undefined, zoneFileLookupURL: string | undefined, forceText: boolean, fetchFn?: FetchFn): Promise<string | ArrayBuffer | null>;
     getFileSignedUnencrypted(path: string, opt: GetFileOptions): Promise<string | ArrayBuffer | null>;
-    handleSignedEncryptedContents(path: string, storedContents: string, app: string, privateKey?: string, username?: string, zoneFileLookupURL?: string): Promise<string | Buffer>;
-    putFile(path: string, content: string | Buffer | ArrayBufferView | Blob, options?: PutFileOptions): Promise<string>;
+    handleSignedEncryptedContents(path: string, storedContents: string, app: string, privateKey?: string, username?: string, zoneFileLookupURL?: string): Promise<string | Uint8Array>;
+    putFile(path: string, content: string | Uint8Array | ArrayBufferView | Blob, options?: PutFileOptions): Promise<string>;
     deleteFile(path: string, options?: {
         wasSigned?: boolean;
     }): Promise<void>;

package/dist/esm/storage.js

@@ -1,6 +1,6 @@
 import { lookupProfile, NAME_LOOKUP_PATH } from '@stacks/auth';
-import { BLOCKSTACK_DEFAULT_GAIA_HUB_URL, DoesNotExist, getGlobalObject, InvalidStateError, megabytesToBytes, PayloadTooLargeError, SignatureVerificationError, } from '@stacks/common';
-import { eciesGetJsonStringLength, getPublicKeyFromPrivate, publicKeyToAddress, signECDSA, verifyECDSA, } from '@stacks/encryption';
+import { BLOCKSTACK_DEFAULT_GAIA_HUB_URL, DoesNotExist, getGlobalObject, InvalidStateError, megabytesToBytes, PayloadTooLargeError, SignatureVerificationError, utf8ToBytes, } from '@stacks/common';
+import { eciesGetJsonStringLength, getPublicKeyFromPrivate, publicKeyToAddress, publicKeyToBtcAddress, signECDSA, verifyECDSA, } from '@stacks/encryption';
 import { createFetchFn } from '@stacks/network';
 import { FileContentLoader } from './fileContentLoader';
 import { connectToGaiaHub, deleteFromGaiaHub, getBlockstackErrorFromResponse, getBucketUrl, getFullReadUrl, uploadToGaiaHub, } from './hub';
@@ -132,16 +132,13 @@ export class Storage {
                 this.getFileContents(sigPath, opt.app, opt.username, opt.zoneFileLookupURL, true),
                 this.getGaiaAddress(opt.app, opt.username, opt.zoneFileLookupURL),
             ]);
-            if (!fileContents) {
+            if (!fileContents)
                 return fileContents;
-            }
-            if (!gaiaAddress) {
+            if (!gaiaAddress)
                 throw new SignatureVerificationError(`Failed to get gaia address for verification of: ${path}`);
-            }
-            if (!signatureContents || typeof signatureContents !== 'string') {
+            if (!signatureContents || typeof signatureContents !== 'string')
                 throw new SignatureVerificationError('Failed to obtain signature for file: ' +
                     `${path} -- looked in ${path}${SIGNATURE_FILE_SUFFIX}`);
-            }
             let signature;
             let publicKey;
             try {
@@ -150,48 +147,32 @@ export class Storage {
                 publicKey = sigObject.publicKey;
             }
             catch (err) {
-                if (err instanceof SyntaxError) {
-                    throw new Error('Failed to parse signature content JSON ' +
-                        `(path: ${path}${SIGNATURE_FILE_SUFFIX})` +
-                        ' The content may be corrupted.');
-                }
-                else {
-                    throw err;
-                }
+                if (err instanceof SyntaxError)
+                    throw new Error(`Failed to parse signature content JSON (path: ${path}${SIGNATURE_FILE_SUFFIX}) The content may be corrupted.`);
+                throw err;
             }
             const signerAddress = publicKeyToAddress(publicKey);
-            if (gaiaAddress !== signerAddress) {
-                throw new SignatureVerificationError(`Signer pubkey address (${signerAddress}) doesn't` +
-                    ` match gaia address (${gaiaAddress})`);
-            }
-            else if (!verifyECDSA(fileContents, publicKey, signature)) {
-                throw new SignatureVerificationError('Contents do not match ECDSA signature: ' +
-                    `path: ${path}, signature: ${path}${SIGNATURE_FILE_SUFFIX}`);
-            }
-            else {
-                return fileContents;
+            if (gaiaAddress !== signerAddress)
+                throw new SignatureVerificationError(`Signer pubkey address (${signerAddress}) doesn't match gaia address (${gaiaAddress})`);
+            if (!verifyECDSA(typeof fileContents === 'string'
+                ? utf8ToBytes(fileContents)
+                : new Uint8Array(fileContents), publicKey, signature)) {
+                throw new SignatureVerificationError(`Contents do not match ECDSA signature: path: ${path}, signature: ${path}${SIGNATURE_FILE_SUFFIX}`);
             }
+            return fileContents;
         }
         catch (err) {
-            if (err instanceof DoesNotExist && err.message.indexOf(sigPath) >= 0) {
-                throw new SignatureVerificationError('Failed to obtain signature for file: ' +
-                    `${path} -- looked in ${path}${SIGNATURE_FILE_SUFFIX}`);
-            }
-            else {
-                throw err;
-            }
+            if (err instanceof DoesNotExist && err.message.indexOf(sigPath) >= 0)
+                throw new SignatureVerificationError(`Failed to obtain signature for file: ${path} -- looked in ${path}${SIGNATURE_FILE_SUFFIX}`);
+            throw err;
         }
     }
     async handleSignedEncryptedContents(path, storedContents, app, privateKey, username, zoneFileLookupURL) {
         const appPrivateKey = privateKey || this.userSession.loadUserData().appPrivateKey;
         const appPublicKey = getPublicKeyFromPrivate(appPrivateKey);
-        let address;
-        if (username) {
-            address = await this.getGaiaAddress(app, username, zoneFileLookupURL);
-        }
-        else {
-            address = publicKeyToAddress(appPublicKey);
-        }
+        const address = username
+            ? await this.getGaiaAddress(app, username, zoneFileLookupURL)
+            : publicKeyToBtcAddress(appPublicKey);
         if (!address) {
             throw new SignatureVerificationError(`Failed to get gaia address for verification of: ${path}`);
         }
@@ -201,9 +182,7 @@ export class Storage {
         }
         catch (err) {
             if (err instanceof SyntaxError) {
-                throw new Error('Failed to parse encrypted, signed content JSON. The content may not ' +
-                    'be encrypted. If using getFile, try passing' +
-                    ' { verify: false, decrypt: false }.');
+                throw new Error('Failed to parse encrypted, signed content JSON. The content may not be encrypted. If using getFile, try passing { verify: false, decrypt: false }.');
             }
             else {
                 throw err;
@@ -214,13 +193,13 @@ export class Storage {
         const cipherText = sigObject.cipherText;
         const signerAddress = publicKeyToAddress(signerPublicKey);
         if (!signerPublicKey || !cipherText || !signature) {
-            throw new SignatureVerificationError('Failed to get signature verification data from file:' + ` ${path}`);
+            throw new SignatureVerificationError(`Failed to get signature verification data from file: ${path}`);
         }
         else if (signerAddress !== address) {
-            throw new SignatureVerificationError(`Signer pubkey address (${signerAddress}) doesn't` + ` match gaia address (${address})`);
+            throw new SignatureVerificationError(`Signer pubkey address (${signerAddress}) doesn't match gaia address (${address})`);
         }
         else if (!verifyECDSA(cipherText, signerPublicKey, signature)) {
-            throw new SignatureVerificationError('Contents do not match ECDSA signature in file:' + ` ${path}`);
+            throw new SignatureVerificationError(`Contents do not match ECDSA signature in file: ${path}`);
         }
         else if (typeof privateKey === 'string') {
             const decryptOpt = { privateKey };

package/dist/esm/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}

package/dist/fileContentLoader.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="node" />
-export declare type PutFileContent = string | Buffer | ArrayBufferView | ArrayBufferLike | Blob;
+export declare type PutFileContent = string | Uint8Array | ArrayBufferView | ArrayBufferLike | Blob;
 export declare class FileContentLoader {
-    readonly content: Buffer | Blob;
+    readonly content: Uint8Array | Blob;
     readonly wasString: boolean;
     readonly contentType: string;
     readonly contentByteLength: number;
@@ -12,5 +11,5 @@ export declare class FileContentLoader {
     private detectContentType;
     private detectContentLength;
     private loadContent;
-    load(): Promise<Buffer | string>;
+    load(): Promise<Uint8Array | string>;
 }

package/dist/fileContentLoader.js

@@ -20,28 +20,28 @@ class FileContentLoader {
                 }
                 if (typeof TextEncoder !== 'undefined') {
                     const encodedString = new TextEncoder().encode(content);
-                    return common_1.Buffer.from(encodedString.buffer);
+                    return new Uint8Array(encodedString.buffer);
                 }
-                return common_1.Buffer.from(content);
+                return (0, common_1.utf8ToBytes)(content);
             }
-            else if (common_1.Buffer.isBuffer(content)) {
+            else if (content instanceof Uint8Array) {
                 return content;
             }
             else if (ArrayBuffer.isView(content)) {
-                return common_1.Buffer.from(content.buffer, content.byteOffset, content.byteLength);
+                return new Uint8Array(content.buffer.slice(content.byteOffset, content.byteOffset + content.byteLength));
             }
             else if (typeof Blob !== 'undefined' && content instanceof Blob) {
                 return content;
             }
             else if (typeof ArrayBuffer !== 'undefined' && content instanceof ArrayBuffer) {
-                return common_1.Buffer.from(content);
+                return new Uint8Array(content);
             }
             else if (Array.isArray(content)) {
                 if (content.length > 0 &&
                     (!Number.isInteger(content[0]) || content[0] < 0 || content[0] > 255)) {
                     throw new Error(`Unexpected array values provided as file data: value "${content[0]}" at index 0 is not an octet number. ${this.supportedTypesMsg}`);
                 }
-                return common_1.Buffer.from(content);
+                return new Uint8Array(content);
             }
             else {
                 const typeName = Object.prototype.toString.call(content);
@@ -65,7 +65,7 @@ class FileContentLoader {
         }
     }
     detectContentLength() {
-        if (ArrayBuffer.isView(this.content) || common_1.Buffer.isBuffer(this.content)) {
+        if (ArrayBuffer.isView(this.content) || this.content instanceof Uint8Array) {
             return this.content.byteLength;
         }
         else if (typeof Blob !== 'undefined' && this.content instanceof Blob) {
@@ -78,11 +78,11 @@ class FileContentLoader {
     }
     async loadContent() {
         try {
-            if (common_1.Buffer.isBuffer(this.content)) {
+            if (this.content instanceof Uint8Array) {
                 return this.content;
             }
             else if (ArrayBuffer.isView(this.content)) {
-                return common_1.Buffer.from(this.content.buffer, this.content.byteOffset, this.content.byteLength);
+                return new Uint8Array(this.content.buffer, this.content.byteOffset, this.content.byteLength);
             }
             else if (typeof Blob !== 'undefined' && this.content instanceof Blob) {
                 const reader = new FileReader();
@@ -92,12 +92,11 @@ class FileContentLoader {
                     };
                     reader.onload = () => {
                         const arrayBuffer = reader.result;
-                        resolve(common_1.Buffer.from(arrayBuffer));
+                        resolve(new Uint8Array(arrayBuffer));
                     };
                     reader.readAsArrayBuffer(this.content);
                 });
-                const result = await readPromise;
-                return result;
+                return await readPromise;
             }
             else {
                 const typeName = Object.prototype.toString.call(this.content);
@@ -120,5 +119,5 @@ class FileContentLoader {
 }
 exports.FileContentLoader = FileContentLoader;
 FileContentLoader.supportedTypesMsg = 'Supported types are: `string` (to be UTF8 encoded), ' +
-    '`Buffer`, `Blob`, `File`, `ArrayBuffer`, `UInt8Array` or any other typed array buffer. ';
+    '`Blob`, `File`, `ArrayBuffer`, `UInt8Array` or any other typed array buffer. ';
 //# sourceMappingURL=fileContentLoader.js.map

package/dist/fileContentLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileContentLoader.js","sourceRoot":"","sources":["../src/fileContentLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fileContentLoader.js","sourceRoot":"","sources":["../src/fileContentLoader.ts"],"names":[],"mappings":"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"}

package/dist/hub.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FetchFn } from '@stacks/network';
 export declare const BLOCKSTACK_GAIA_HUB_LABEL = "blockstack-gaia-hub-config";
 export interface GaiaHubConfig {
@@ -12,7 +11,7 @@ interface UploadResponse {
     publicURL: string;
     etag?: string;
 }
-export declare function uploadToGaiaHub(filename: string, contents: Blob | Buffer | ArrayBufferView | string, hubConfig: GaiaHubConfig, contentType?: string, newFile?: boolean, etag?: string, dangerouslyIgnoreEtag?: boolean, fetchFn?: FetchFn): Promise<UploadResponse>;
+export declare function uploadToGaiaHub(filename: string, contents: Blob | Uint8Array | ArrayBufferView | string, hubConfig: GaiaHubConfig, contentType?: string, newFile?: boolean, etag?: string, dangerouslyIgnoreEtag?: boolean, fetchFn?: FetchFn): Promise<UploadResponse>;
 export declare function deleteFromGaiaHub(filename: string, hubConfig: GaiaHubConfig, fetchFn?: FetchFn): Promise<void>;
 export declare function getFullReadUrl(filename: string, hubConfig: GaiaHubConfig): Promise<string>;
 export declare function connectToGaiaHub(gaiaHubUrl: string, challengeSignerHex: string, associationToken?: string, fetchFn?: FetchFn): Promise<GaiaHubConfig>;

package/dist/hub.js

@@ -4,6 +4,7 @@ exports.getBlockstackErrorFromResponse = exports.getBucketUrl = exports.connectT
 const common_1 = require("@stacks/common");
 const encryption_1 = require("@stacks/encryption");
 const network_1 = require("@stacks/network");
+const base64_js_1 = require("base64-js");
 const jsontokens_1 = require("jsontokens");
 exports.BLOCKSTACK_GAIA_HUB_LABEL = 'blockstack-gaia-hub-config';
 async function uploadToGaiaHub(filename, contents, hubConfig, contentType = 'application/octet-stream', newFile = true, etag, dangerouslyIgnoreEtag, fetchFn = (0, network_1.createFetchFn)()) {
@@ -58,16 +59,14 @@ function makeLegacyAuthToken(challengeText, signerKeyHex) {
         throw new Error('Failed in parsing legacy challenge text from the gaia hub.');
     }
     if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
-        const digest = (0, encryption_1.hashSha256Sync)(common_1.Buffer.from(challengeText));
-        const signatureBuffer = (0, encryption_1.ecSign)(digest, (0, encryption_1.compressPrivateKey)(signerKeyHex));
-        const signature = encryption_1.Signature.fromCompact(signatureBuffer.toString('hex')).toDERHex();
+        const digest = (0, encryption_1.hashSha256Sync)((0, common_1.utf8ToBytes)(challengeText));
+        const signatureBytes = (0, encryption_1.ecSign)(digest, (0, encryption_1.compressPrivateKey)(signerKeyHex));
+        const signature = encryption_1.Signature.fromCompact((0, common_1.bytesToHex)(signatureBytes)).toDERHex();
         const publickey = (0, encryption_1.getPublicKeyFromPrivate)(signerKeyHex);
-        const token = common_1.Buffer.from(JSON.stringify({ publickey, signature })).toString('base64');
+        const token = (0, base64_js_1.fromByteArray)((0, common_1.utf8ToBytes)(JSON.stringify({ publickey, signature })));
         return token;
     }
-    else {
-        throw new Error('Failed to connect to legacy gaia hub. If you operate this hub, please update.');
-    }
+    throw new Error('Failed to connect to legacy gaia hub. If you operate this hub, please update.');
 }
 function makeV1GaiaAuthToken(hubInfo, signerKeyHex, hubUrl, associationToken) {
     const challengeText = hubInfo.challenge_text;
@@ -76,7 +75,7 @@ function makeV1GaiaAuthToken(hubInfo, signerKeyHex, hubUrl, associationToken) {
     if (!handlesV1Auth) {
         return makeLegacyAuthToken(challengeText, signerKeyHex);
     }
-    const salt = (0, encryption_1.randomBytes)(16).toString('hex');
+    const salt = (0, common_1.bytesToHex)((0, encryption_1.randomBytes)(16));
     const payload = {
         gaiaChallenge: challengeText,
         hubUrl,