@stacks/storage 6.14.1-pr.44 → 6.14.1-pr.64
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 +4 -3
- package/dist/esm/hub.js.map +1 -1
- package/dist/hub.js +2 -1
- package/dist/hub.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +6 -6
- package/src/hub.ts +4 -2
package/dist/esm/hub.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BadPathError, bytesToHex, ConflictError, DoesNotExist, Logger, megabytesToBytes, NotEnoughProofError, PayloadTooLargeError, PreconditionFailedError, utf8ToBytes, ValidationError, } from '@stacks/common';
|
|
2
|
-
import {
|
|
1
|
+
import { BadPathError, bytesToHex, ConflictError, DoesNotExist, Logger, megabytesToBytes, NotEnoughProofError, PayloadTooLargeError, PreconditionFailedError, PRIVATE_KEY_BYTES_COMPRESSED, utf8ToBytes, ValidationError, } from '@stacks/common';
|
|
2
|
+
import { ecSign, getPublicKeyFromPrivate, hashSha256Sync, publicKeyToBtcAddress, randomBytes, Signature, } from '@stacks/encryption';
|
|
3
3
|
import { createFetchFn } from '@stacks/common';
|
|
4
4
|
import { fromByteArray } from 'base64-js';
|
|
5
5
|
import { TokenSigner } from 'jsontokens';
|
|
@@ -54,7 +54,8 @@ function makeLegacyAuthToken(challengeText, signerKeyHex) {
|
|
|
54
54
|
}
|
|
55
55
|
if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
|
|
56
56
|
const digest = hashSha256Sync(utf8ToBytes(challengeText));
|
|
57
|
-
const
|
|
57
|
+
const compressedPrivateKey = signerKeyHex.length === PRIVATE_KEY_BYTES_COMPRESSED * 2 ? signerKeyHex : `${signerKeyHex}01`;
|
|
58
|
+
const signatureBytes = ecSign(digest, compressedPrivateKey);
|
|
58
59
|
const signature = Signature.fromCompact(bytesToHex(signatureBytes)).toDERHex();
|
|
59
60
|
const publickey = getPublicKeyFromPrivate(signerKeyHex);
|
|
60
61
|
const token = fromByteArray(utf8ToBytes(JSON.stringify({ publickey, signature })));
|
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,UAAU,EACV,aAAa,EACb,YAAY,EAEZ,MAAM,EACN,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,EACvB,WAAW,EACX,eAAe,GAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/hub.ts"],"names":[],"mappings":"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"}
|
package/dist/hub.js
CHANGED
|
@@ -60,7 +60,8 @@ function makeLegacyAuthToken(challengeText, signerKeyHex) {
|
|
|
60
60
|
}
|
|
61
61
|
if (parsedChallenge[0] === 'gaiahub' && parsedChallenge[3] === 'blockstack_storage_please_sign') {
|
|
62
62
|
const digest = (0, encryption_1.hashSha256Sync)((0, common_1.utf8ToBytes)(challengeText));
|
|
63
|
-
const
|
|
63
|
+
const compressedPrivateKey = signerKeyHex.length === common_1.PRIVATE_KEY_BYTES_COMPRESSED * 2 ? signerKeyHex : `${signerKeyHex}01`;
|
|
64
|
+
const signatureBytes = (0, encryption_1.ecSign)(digest, compressedPrivateKey);
|
|
64
65
|
const signature = encryption_1.Signature.fromCompact((0, common_1.bytesToHex)(signatureBytes)).toDERHex();
|
|
65
66
|
const publickey = (0, encryption_1.getPublicKeyFromPrivate)(signerKeyHex);
|
|
66
67
|
const token = (0, base64_js_1.fromByteArray)((0, common_1.utf8ToBytes)(JSON.stringify({ publickey, signature })));
|
package/dist/hub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../src/hub.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../src/hub.ts"],"names":[],"mappings":"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"}
|