@stacks/storage 4.0.1 → 4.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/hub.js +2 -4
- package/dist/esm/hub.js.map +1 -1
- package/dist/hub.js +1 -3
- package/dist/hub.js.map +1 -1
- package/dist/polyfill/index.js +4 -5
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +5 -6
- package/src/hub.ts +3 -6
package/dist/esm/hub.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BadPathError, Buffer, ConflictError, DoesNotExist, fetchPrivate, Logger, megabytesToBytes, NotEnoughProofError, PayloadTooLargeError, PreconditionFailedError, ValidationError, } from '@stacks/common';
|
|
2
|
-
import { compressPrivateKey, ecSign, getPublicKeyFromPrivate, hashSha256Sync, publicKeyToAddress, randomBytes, } from '@stacks/encryption';
|
|
3
|
-
import { script, Transaction } from 'bitcoinjs-lib';
|
|
2
|
+
import { compressPrivateKey, ecSign, getPublicKeyFromPrivate, hashSha256Sync, publicKeyToAddress, randomBytes, Signature, } from '@stacks/encryption';
|
|
4
3
|
import { TokenSigner } from 'jsontokens';
|
|
5
4
|
export const BLOCKSTACK_GAIA_HUB_LABEL = 'blockstack-gaia-hub-config';
|
|
6
5
|
export async function uploadToGaiaHub(filename, contents, hubConfig, contentType = 'application/octet-stream', newFile = true, etag, dangerouslyIgnoreEtag) {
|
|
@@ -54,8 +53,7 @@ function makeLegacyAuthToken(challengeText, signerKeyHex) {
|
|
|
54
53
|
if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
|
|
55
54
|
const digest = hashSha256Sync(Buffer.from(challengeText));
|
|
56
55
|
const signatureBuffer = ecSign(digest, compressPrivateKey(signerKeyHex));
|
|
57
|
-
const
|
|
58
|
-
const signature = signatureWithHash.toString('hex').slice(0, -2);
|
|
56
|
+
const signature = Signature.fromCompact(signatureBuffer.toString('hex')).toDERHex();
|
|
59
57
|
const publickey = getPublicKeyFromPrivate(signerKeyHex);
|
|
60
58
|
const token = Buffer.from(JSON.stringify({ publickey, signature })).toString('base64');
|
|
61
59
|
return token;
|
package/dist/esm/hub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/hub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,MAAM,EACN,aAAa,EACb,YAAY,EACZ,YAAY,EAEZ,MAAM,EACN,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,EACvB,eAAe,GAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,uBAAuB,EACvB,cAAc,EACd,kBAAkB,EAClB,WAAW,
|
|
1
|
+
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/hub.ts"],"names":[],"mappings":"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"}
|
package/dist/hub.js
CHANGED
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getBlockstackErrorFromResponse = exports.getBucketUrl = exports.connectToGaiaHub = exports.getFullReadUrl = exports.deleteFromGaiaHub = exports.uploadToGaiaHub = exports.BLOCKSTACK_GAIA_HUB_LABEL = void 0;
|
|
4
4
|
const common_1 = require("@stacks/common");
|
|
5
5
|
const encryption_1 = require("@stacks/encryption");
|
|
6
|
-
const bitcoinjs_lib_1 = require("bitcoinjs-lib");
|
|
7
6
|
const jsontokens_1 = require("jsontokens");
|
|
8
7
|
exports.BLOCKSTACK_GAIA_HUB_LABEL = 'blockstack-gaia-hub-config';
|
|
9
8
|
async function uploadToGaiaHub(filename, contents, hubConfig, contentType = 'application/octet-stream', newFile = true, etag, dangerouslyIgnoreEtag) {
|
|
@@ -60,8 +59,7 @@ function makeLegacyAuthToken(challengeText, signerKeyHex) {
|
|
|
60
59
|
if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
|
|
61
60
|
const digest = (0, encryption_1.hashSha256Sync)(common_1.Buffer.from(challengeText));
|
|
62
61
|
const signatureBuffer = (0, encryption_1.ecSign)(digest, (0, encryption_1.compressPrivateKey)(signerKeyHex));
|
|
63
|
-
const
|
|
64
|
-
const signature = signatureWithHash.toString('hex').slice(0, -2);
|
|
62
|
+
const signature = encryption_1.Signature.fromCompact(signatureBuffer.toString('hex')).toDERHex();
|
|
65
63
|
const publickey = (0, encryption_1.getPublicKeyFromPrivate)(signerKeyHex);
|
|
66
64
|
const token = common_1.Buffer.from(JSON.stringify({ publickey, signature })).toString('base64');
|
|
67
65
|
return token;
|
package/dist/hub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../src/hub.ts"],"names":[],"mappings":";;;AAAA,2CAawB;AACxB,
|
|
1
|
+
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../src/hub.ts"],"names":[],"mappings":"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"}
|