@stacks/storage 3.5.1-beta.2 → 3.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stacks/storage",
-  "version": "3.5.1-beta.2",
+  "version": "3.5.1",
   "description": "Stacks storage library",
   "author": "yknl <yukanliao@gmail.com>",
   "homepage": "https://blockstack.org",
@@ -32,9 +32,9 @@
     "url": "https://github.com/blockstack/blockstack.js/issues"
   },
   "dependencies": {
-    "@stacks/auth": "^3.3.0",
-    "@stacks/common": "^3.3.0",
-    "@stacks/encryption": "^3.3.0",
+    "@stacks/auth": "^3.5.1",
+    "@stacks/common": "^3.5.1",
+    "@stacks/encryption": "^3.5.1",
     "bitcoinjs-lib": "^5.2.0",
     "jsontokens": "^3.0.0"
   },
@@ -62,5 +62,5 @@
   "browser": "dist/polyfill/index.js",
   "umd:main": "dist/umd/index.js",
   "unpkg": "dist/umd/index.js",
-  "gitHead": "fc04515dd2073104b459301a3016c55d3231889a"
+  "gitHead": "7a0fbb9b2bf7ba7e842c1eecaf69b052fc6b5df1"
 }

package/src/hub.ts

@@ -1,6 +1,16 @@
+import { Buffer } from '@stacks/common';
+import { ECPair, script, Transaction } from 'bitcoinjs-lib';
+import { TokenSigner } from 'jsontokens';
+import {
+  ecPairToAddress,
+  getPublicKeyFromPrivate,
+  hashSha256Sync,
+  hexStringToECPair,
+  randomBytes,
+} from '@stacks/encryption';
+
 import {
   BadPathError,
-  Buffer,
   ConflictError,
   DoesNotExist,
   fetchPrivate,
@@ -12,16 +22,6 @@ import {
   PreconditionFailedError,
   ValidationError,
 } from '@stacks/common';
-import {
-  compressPrivateKey,
-  ecSign,
-  getPublicKeyFromPrivate,
-  hashSha256Sync,
-  publicKeyToAddress,
-  randomBytes,
-} from '@stacks/encryption';
-import { script, Transaction } from 'bitcoinjs-lib';
-import { TokenSigner } from 'jsontokens';
 
 /**
  * @ignore
@@ -149,8 +149,10 @@ function makeLegacyAuthToken(challengeText: string, signerKeyHex: string): strin
     throw new Error('Failed in parsing legacy challenge text from the gaia hub.');
   }
   if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
+    const signer = hexStringToECPair(signerKeyHex + (signerKeyHex.length === 64 ? '01' : ''));
     const digest = hashSha256Sync(Buffer.from(challengeText));
-    const signatureBuffer = ecSign(digest, compressPrivateKey(signerKeyHex));
+
+    const signatureBuffer = signer.sign(digest);
     const signatureWithHash = script.signature.encode(signatureBuffer, Transaction.SIGHASH_NONE);
 
     // We only want the DER encoding so remove the sighash version byte at the end.
@@ -219,7 +221,9 @@ export async function connectToGaiaHub(
   const hubInfo = await response.json();
   const readURL = hubInfo.read_url_prefix;
   const token = makeV1GaiaAuthToken(hubInfo, challengeSignerHex, gaiaHubUrl, associationToken);
-  const address = publicKeyToAddress(getPublicKeyFromPrivate(challengeSignerHex));
+  const address = ecPairToAddress(
+    hexStringToECPair(challengeSignerHex + (challengeSignerHex.length === 64 ? '01' : ''))
+  );
   return {
     url_prefix: readURL,
     max_file_upload_size_megabytes: hubInfo.max_file_upload_size_megabytes,
@@ -237,11 +241,12 @@ export async function connectToGaiaHub(
  * @ignore
  */
 export async function getBucketUrl(gaiaHubUrl: string, appPrivateKey: string): Promise<string> {
+  const challengeSigner = ECPair.fromPrivateKey(Buffer.from(appPrivateKey, 'hex'));
   const response = await fetchPrivate(`${gaiaHubUrl}/hub_info`);
   const responseText = await response.text();
   const responseJSON = JSON.parse(responseText);
   const readURL = responseJSON.read_url_prefix;
-  const address = publicKeyToAddress(getPublicKeyFromPrivate(appPrivateKey));
+  const address = ecPairToAddress(challengeSigner);
   const bucketUrl = `${readURL}${address}/`;
   return bucketUrl;
 }

package/src/storage.ts

@@ -1,6 +1,24 @@
 // @ts-ignore
 import { Buffer } from '@stacks/common';
-import { lookupProfile, NAME_LOOKUP_PATH, UserSession } from '@stacks/auth';
+import {
+  connectToGaiaHub,
+  deleteFromGaiaHub,
+  GaiaHubConfig,
+  getBlockstackErrorFromResponse,
+  getBucketUrl,
+  getFullReadUrl,
+  uploadToGaiaHub,
+} from './hub';
+
+import {
+  eciesGetJsonStringLength,
+  EncryptionOptions,
+  getPublicKeyFromPrivate,
+  publicKeyToAddress,
+  signECDSA,
+  verifyECDSA,
+} from '@stacks/encryption';
+
 import {
   BLOCKSTACK_DEFAULT_GAIA_HUB_URL,
   DoesNotExist,
@@ -12,24 +30,10 @@ import {
   PayloadTooLargeError,
   SignatureVerificationError,
 } from '@stacks/common';
-import {
-  eciesGetJsonStringLength,
-  EncryptionOptions,
-  getPublicKeyFromPrivate,
-  publicKeyToAddress,
-  signECDSA,
-  verifyECDSA,
-} from '@stacks/encryption';
+
 import { FileContentLoader } from './fileContentLoader';
-import {
-  connectToGaiaHub,
-  deleteFromGaiaHub,
-  GaiaHubConfig,
-  getBlockstackErrorFromResponse,
-  getBucketUrl,
-  getFullReadUrl,
-  uploadToGaiaHub,
-} from './hub';
+
+import { lookupProfile, NAME_LOOKUP_PATH, UserSession } from '@stacks/auth';
 
 /**
  * Specify a valid MIME type, encryption options, and whether to sign the [[UserSession.putFile]].
@@ -327,7 +331,7 @@ export class Storage {
       }
       if (!gaiaAddress) {
         throw new SignatureVerificationError(
-          `Failed to get gaia address for verification of: ${path}`
+          'Failed to get gaia address for verification of: ' + `${path}`
         );
       }
       if (!signatureContents || typeof signatureContents !== 'string') {
@@ -407,7 +411,7 @@ export class Storage {
     }
     if (!address) {
       throw new SignatureVerificationError(
-        `Failed to get gaia address for verification of: ${path}`
+        'Failed to get gaia address for verification of: ' + `${path}`
       );
     }
     let sigObject;