arbundles - npm Package Compare versions

Comparing version 0.6.17-rc1 to 0.7.0-rc1

file/createData.d.ts

 /// <reference types="node" />
 import FileDataItem from "./FileDataItem";
-import { DataItemCreateOptions } from "../src/ar-data-base";
+import { DataItemCreateOptions } from "../src/arDataBase";
 import { Signer } from "../src/signing";
+/**
+ * @param data
+ * @param signer
+ * @param opts
+ * @returns
+ */
 export declare function createData(data: string | Uint8Array | NodeJS.ReadableStream, signer: Signer, opts?: DataItemCreateOptions): Promise<FileDataItem>;

file/createData.js

@@ -30,6 +30,11 @@ "use strict";
 const base64url_1 = __importDefault(require("base64url"));
-const assert_1 = __importDefault(require("assert"));
 const utils_1 = require("../src/utils");
 const parser_1 = require("../src/parser");
 const promises_1 = require("stream/promises");
+/**
+ * @param data
+ * @param signer
+ * @param opts
+ * @returns
+ */
 async function createData(data, signer, opts) {
@@ -39,4 +44,2 @@ var _a, _b, _c, _d, _e;
     const stream = fs.createWriteStream(filename);
-    // TODO: Add asserts
-    // Parse all values to a buffer and
     const _owner = signer.publicKey;
@@ -47,9 +50,12 @@ const _target = (opts === null || opts === void 0 ? void 0 : opts.target) ? base64url_1.default.toBuffer(opts.target) : null;
     stream.write(utils_1.shortTo2ByteArray(signer.signatureType));
-    // Signature
     stream.write(new Uint8Array(signer.signatureLength).fill(0));
-    assert_1.default(_owner.byteLength == signer.ownerLength, new Error(`Owner must be ${signer.ownerLength} bytes`));
+    if (_owner.byteLength != signer.ownerLength) {
+        throw new Error(`Owner must be ${signer.ownerLength} bytes`);
+    }
     stream.write(_owner);
     stream.write(_target ? singleItemBuffer(1) : singleItemBuffer(0));
     if (_target) {
-        assert_1.default(_target.byteLength == 32, new Error("Target must be 32 bytes"));
+        if (_target.byteLength != 32) {
+            throw new Error("Target must be 32 bytes");
+        }
         stream.write(_target);
@@ -59,7 +65,7 @@ }
     if (_anchor) {
-        assert_1.default(_anchor.byteLength == 32, new Error("Anchor must be 32 bytes"));
+        if (_anchor.byteLength != 32) {
+            throw new Error("Anchor must be 32 bytes");
+        }
         stream.write(_anchor);
     }
-    // TODO: Shall I manually add 8 bytes?
-    // TODO: Finish this
     stream.write(utils_1.longTo8ByteArray((_d = (_c = opts === null || opts === void 0 ? void 0 : opts.tags) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0));
@@ -66,0 +72,0 @@ const bytesCount = utils_1.longTo8ByteArray((_e = _tags === null || _tags === void 0 ? void 0 : _tags.byteLength) !== null && _e !== void 0 ? _e : 0);

file/file.d.ts

 /// <reference types="node" />
+import * as fs from "fs";
 import { FileHandle } from "fs/promises";
 declare type File = string | FileHandle;
+export declare const read: (fd: number, buffer: any, offset: number, length: number, position: fs.ReadPosition) => Promise<{
+    buffer: Buffer;
+    bytesRead: number;
+}>;
+export declare const write: (fd: number, buffer: any, offset: number, length: number, position: number) => Promise<{
+    buffer: Buffer;
+    written: number;
+}>;
 interface Transaction {
@@ -5,0 +14,0 @@ id: string;

file/file.js

@@ -25,9 +25,29 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTags = exports.getAnchor = exports.getTarget = exports.getOwner = exports.getSignature = exports.getId = exports.getHeaders = exports.getHeaderAt = exports.numberOfItems = exports.fileToJson = void 0;
+exports.getTags = exports.getAnchor = exports.getTarget = exports.getOwner = exports.getSignature = exports.getId = exports.getHeaders = exports.getHeaderAt = exports.numberOfItems = exports.fileToJson = exports.write = exports.read = void 0;
 const fs = __importStar(require("fs"));
-const util_1 = require("util");
 const utils_1 = require("../src/utils");
 const parser_1 = require("../src/parser");
 const base64url_1 = __importDefault(require("base64url"));
-const read = util_1.promisify(fs.read);
+const read = async (fd, buffer, offset, length, position) => {
+    return new Promise((res, rej) => {
+        fs.read(fd, buffer, offset, length, position, (err, bytesRead, buffer) => {
+            if (err) {
+                rej(err);
+            }
+            res({ bytesRead, buffer });
+        });
+    });
+};
+exports.read = read;
+const write = async (fd, buffer, offset, length, position) => {
+    return new Promise((res, rej) => {
+        fs.write(fd, buffer, offset, length, position, (err, written, buffer) => {
+            if (err) {
+                rej(err);
+            }
+            res({ written, buffer });
+        });
+    });
+};
+exports.write = write;
 const fileToFd = async (f) => typeof f === "string" ? await fs.promises.open(f, "r") : f;
@@ -37,13 +57,13 @@ async function fileToJson(filename) {
     let tagsStart = 512 + 512 + 2;
-    const targetPresent = await read(fd, Buffer.alloc(1), 1024, 64, null).then((value) => value.buffer[0] == 1);
+    const targetPresent = await exports.read(fd, Buffer.alloc(1), 1024, 64, null).then((value) => value.buffer[0] == 1);
     tagsStart += targetPresent ? 32 : 0;
     const anchorPresentByte = targetPresent ? 1057 : 1025;
-    const anchorPresent = await read(fd, Buffer.alloc(1), anchorPresentByte, 64, null).then((value) => value.buffer[0] == 1);
+    const anchorPresent = await exports.read(fd, Buffer.alloc(1), anchorPresentByte, 64, null).then((value) => value.buffer[0] == 1);
     tagsStart += anchorPresent ? 32 : 0;
-    const numberOfTags = utils_1.byteArrayToLong(await read(fd, Buffer.alloc(8), tagsStart, 8, 0).then((value) => value.buffer));
+    const numberOfTags = utils_1.byteArrayToLong(await exports.read(fd, Buffer.alloc(8), tagsStart, 8, 0).then((value) => value.buffer));
     let tags = [];
     if (numberOfTags > 0) {
-        const numberOfTagBytesArray = await read(fd, Buffer.alloc(8), tagsStart + 8, 8, 0).then((value) => value.buffer);
+        const numberOfTagBytesArray = await exports.read(fd, Buffer.alloc(8), tagsStart + 8, 8, 0).then((value) => value.buffer);
         const numberOfTagBytes = utils_1.byteArrayToLong(numberOfTagBytesArray);
-        const tagBytes = await read(fd, Buffer.alloc(8), tagsStart + 16, numberOfTagBytes, 0).then((value) => value.buffer);
+        const tagBytes = await exports.read(fd, Buffer.alloc(8), tagsStart + 16, numberOfTagBytes, 0).then((value) => value.buffer);
         tags = parser_1.tagsParser.fromBuffer(tagBytes);
@@ -70,3 +90,3 @@ }
     const fd = await fileToFd(file);
-    const headerBuffer = await read(fd.fd, Buffer.allocUnsafe(32), 0, 32, 0).then((v) => v.buffer);
+    const headerBuffer = await exports.read(fd.fd, Buffer.allocUnsafe(32), 0, 32, 0).then((v) => v.buffer);
     await fd.close();
@@ -78,3 +98,3 @@ return utils_1.byteArrayToLong(headerBuffer);
     const fd = await fileToFd(file);
-    const headerBuffer = await read(fd.fd, Buffer.alloc(64), 0, 64, 32 + 64 * index).then((v) => v.buffer);
+    const headerBuffer = await exports.read(fd.fd, Buffer.alloc(64), 0, 64, 32 + 64 * index).then((v) => v.buffer);
     return {
@@ -97,3 +117,3 @@ offset: utils_1.byteArrayToLong(headerBuffer.subarray(0, 32)),
     const offset = (_a = options.offset) !== null && _a !== void 0 ? _a : 0;
-    const buffer = await read(fd.fd, Buffer.allocUnsafe(512), offset, 512, null).then((r) => r.buffer);
+    const buffer = await exports.read(fd.fd, Buffer.allocUnsafe(512), offset, 512, null).then((r) => r.buffer);
     await fd.close();
@@ -107,3 +127,3 @@ return buffer;
     const offset = (_a = options.offset) !== null && _a !== void 0 ? _a : 0;
-    const buffer = await read(fd.fd, Buffer.allocUnsafe(512), offset, 512, null).then((r) => r.buffer);
+    const buffer = await exports.read(fd.fd, Buffer.allocUnsafe(512), offset, 512, null).then((r) => r.buffer);
     await fd.close();
@@ -117,3 +137,3 @@ return buffer;
     const offset = (_a = options.offset) !== null && _a !== void 0 ? _a : 0;
-    const buffer = await read(fd.fd, Buffer.allocUnsafe(512), offset + 512, 512, null).then((r) => r.buffer);
+    const buffer = await exports.read(fd.fd, Buffer.allocUnsafe(512), offset + 512, 512, null).then((r) => r.buffer);
     await fd.close();
@@ -128,7 +148,7 @@ return base64url_1.default.encode(buffer);
     const targetStart = offset + 1024;
-    const targetPresent = await read(fd.fd, Buffer.allocUnsafe(1), targetStart, 1, null).then((value) => value.buffer[0] == 1);
+    const targetPresent = await exports.read(fd.fd, Buffer.allocUnsafe(1), targetStart, 1, null).then((value) => value.buffer[0] == 1);
     if (!targetPresent) {
         return undefined;
     }
-    const buffer = await read(fd.fd, Buffer.allocUnsafe(32), targetStart + 1, 32, null).then((r) => r.buffer);
+    const buffer = await exports.read(fd.fd, Buffer.allocUnsafe(32), targetStart + 1, 32, null).then((r) => r.buffer);
     await fd.close();
@@ -142,3 +162,3 @@ return base64url_1.default.encode(buffer);
     const offset = (_a = options.offset) !== null && _a !== void 0 ? _a : 0;
-    const targetPresent = await read(fd.fd, Buffer.allocUnsafe(1), 1024, 1, null).then((value) => value.buffer[0] == 1);
+    const targetPresent = await exports.read(fd.fd, Buffer.allocUnsafe(1), 1024, 1, null).then((value) => value.buffer[0] == 1);
     let anchorStart = offset + 1025;
@@ -148,7 +168,7 @@ if (targetPresent) {
     }
-    const anchorPresent = await read(fd.fd, Buffer.allocUnsafe(1), anchorStart, 1, null).then((value) => value.buffer[0] == 1);
+    const anchorPresent = await exports.read(fd.fd, Buffer.allocUnsafe(1), anchorStart, 1, null).then((value) => value.buffer[0] == 1);
     if (!anchorPresent) {
         return undefined;
     }
-    const buffer = await read(fd.fd, Buffer.allocUnsafe(32), anchorStart + 1, 32, null).then((r) => r.buffer);
+    const buffer = await exports.read(fd.fd, Buffer.allocUnsafe(32), anchorStart + 1, 32, null).then((r) => r.buffer);
     await fd.close();
@@ -163,14 +183,14 @@ return base64url_1.default.encode(buffer);
     let tagsStart = 512 + 512 + 2 + ((_b = options === null || options === void 0 ? void 0 : options.offset) !== null && _b !== void 0 ? _b : 0);
-    const targetPresent = await read(fd.fd, Buffer.allocUnsafe(1), 0, 1, offset + 1024).then((value) => value.buffer[0] == 1);
+    const targetPresent = await exports.read(fd.fd, Buffer.allocUnsafe(1), 0, 1, offset + 1024).then((value) => value.buffer[0] == 1);
     tagsStart += targetPresent ? 32 : 0;
     const anchorPresentByte = offset + (targetPresent ? 1057 : 1025);
-    const anchorPresent = await read(fd.fd, Buffer.allocUnsafe(1), 0, 1, anchorPresentByte).then((value) => value.buffer[0] == 1);
+    const anchorPresent = await exports.read(fd.fd, Buffer.allocUnsafe(1), 0, 1, anchorPresentByte).then((value) => value.buffer[0] == 1);
     tagsStart += anchorPresent ? 32 : 0;
-    const numberOfTags = utils_1.byteArrayToLong(await read(fd.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart).then((value) => value.buffer));
+    const numberOfTags = utils_1.byteArrayToLong(await exports.read(fd.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart).then((value) => value.buffer));
     if (numberOfTags == 0) {
         return [];
     }
-    const numberOfTagBytesArray = await read(fd.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((value) => value.buffer);
+    const numberOfTagBytesArray = await exports.read(fd.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((value) => value.buffer);
     const numberOfTagBytes = utils_1.byteArrayToLong(numberOfTagBytesArray);
-    const tagBytes = await read(fd.fd, Buffer.allocUnsafe(numberOfTagBytes), 0, numberOfTagBytes, tagsStart + 16).then((value) => value.buffer);
+    const tagBytes = await exports.read(fd.fd, Buffer.allocUnsafe(numberOfTagBytes), 0, numberOfTagBytes, tagsStart + 16).then((value) => value.buffer);
     await fd.close();
@@ -177,0 +197,0 @@ return parser_1.tagsParser.fromBuffer(tagBytes);

file/FileBundle.js

@@ -29,3 +29,2 @@ "use strict";
 const multistream_1 = __importDefault(require("multistream"));
-const util_1 = require("util");
 const base64url_1 = __importDefault(require("base64url"));
@@ -37,3 +36,3 @@ const promises_1 = require("stream/promises");
 // import { pipeline } from 'stream/promises';
-const read = util_1.promisify(fs.read);
+const file_1 = require("./file");
 class FileBundle {
@@ -52,3 +51,3 @@ constructor(headerFile, txs) {
         const handle = await fs.promises.open(this.headerFile, "r");
-        const lengthBuffer = await read(handle.fd, Buffer.allocUnsafe(32), 0, 32, 0).then((r) => r.buffer);
+        const lengthBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(32), 0, 32, 0).then((r) => r.buffer);
         await handle.close();
@@ -123,4 +122,4 @@ return utils_1.byteArrayToLong(lengthBuffer);
             yield {
-                offset: utils_1.byteArrayToLong(await read(handle.fd, Buffer.allocUnsafe(32), 0, 32, i).then((r) => r.buffer)),
-                id: await read(handle.fd, Buffer.allocUnsafe(32), 0, 32, i + 32).then((r) => base64url_1.default.encode(r.buffer)),
+                offset: utils_1.byteArrayToLong(await file_1.read(handle.fd, Buffer.allocUnsafe(32), 0, 32, i).then((r) => r.buffer)),
+                id: await file_1.read(handle.fd, Buffer.allocUnsafe(32), 0, 32, i + 32).then((r) => base64url_1.default.encode(r.buffer)),
             };
@@ -127,0 +126,0 @@ }

file/FileDataItem.js

@@ -32,8 +32,6 @@ "use strict";
 const arweave_1 = __importDefault(require("arweave"));
-const util_1 = require("util");
 const signing_1 = require("../src/signing");
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("../src/constants");
-const write = util_1.promisify(fs.write);
-const read = util_1.promisify(fs.read);
+const file_1 = require("./file");
 class FileDataItem {
@@ -78,4 +76,4 @@ constructor(filename, id) {
         const tagsStart = await item.getTagsStart();
-        const numberOfTags = await read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart).then((r) => utils_1.byteArrayToLong(r.buffer));
-        const numberOfTagsBytes = await read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((r) => utils_1.byteArrayToLong(r.buffer));
+        const numberOfTags = await file_1.read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart).then((r) => utils_1.byteArrayToLong(r.buffer));
+        const numberOfTagsBytes = await file_1.read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((r) => utils_1.byteArrayToLong(r.buffer));
         if (numberOfTagsBytes > 2048) {
@@ -85,3 +83,3 @@ await handle.close();
         }
-        const tagsBytes = await read(handle.fd, Buffer.allocUnsafe(numberOfTagsBytes), 0, numberOfTagsBytes, tagsStart + 16).then((r) => r.buffer);
+        const tagsBytes = await file_1.read(handle.fd, Buffer.allocUnsafe(numberOfTagsBytes), 0, numberOfTagsBytes, tagsStart + 16).then((r) => r.buffer);
         if (numberOfTags > 0) {
@@ -129,3 +127,3 @@ try {
         const handle = await fs.promises.open(this.filename, "r");
-        const buffer = await read(handle.fd, Buffer.allocUnsafe(2), 0, 2, 0).then((r) => r.buffer);
+        const buffer = await file_1.read(handle.fd, Buffer.allocUnsafe(2), 0, 2, 0).then((r) => r.buffer);
         await handle.close();
@@ -137,3 +135,3 @@ return utils_1.byteArrayToLong(buffer);
         const length = await this.signatureLength();
-        const buffer = await read(handle.fd, Buffer.alloc(length), 0, length, 2).then((r) => r.buffer);
+        const buffer = await file_1.read(handle.fd, Buffer.alloc(length), 0, length, 2).then((r) => r.buffer);
         await handle.close();
@@ -148,3 +146,3 @@ return buffer;
         const length = await this.ownerLength();
-        const buffer = await read(handle.fd, Buffer.allocUnsafe(length), 0, length, 2 + (await this.signatureLength())).then((r) => r.buffer);
+        const buffer = await file_1.read(handle.fd, Buffer.allocUnsafe(length), 0, length, 2 + (await this.signatureLength())).then((r) => r.buffer);
         await handle.close();
@@ -159,6 +157,6 @@ return buffer;
         const targetStart = await this.getTargetStart();
-        const targetPresentBuffer = await read(handle.fd, Buffer.allocUnsafe(1), 0, 1, targetStart).then((r) => r.buffer);
+        const targetPresentBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(1), 0, 1, targetStart).then((r) => r.buffer);
         const targetPresent = targetPresentBuffer[0] === 1;
         if (targetPresent) {
-            const targetBuffer = await read(handle.fd, Buffer.allocUnsafe(32), 0, 32, targetStart + 1).then((r) => r.buffer);
+            const targetBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(32), 0, 32, targetStart + 1).then((r) => r.buffer);
             await handle.close();
@@ -180,3 +178,3 @@ return targetBuffer;
             const handle = await fs.promises.open(this.filename, "r");
-            const anchorBuffer = await read(handle.fd, Buffer.allocUnsafe(32), 0, 32, anchorStart + 1).then((r) => r.buffer);
+            const anchorBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(32), 0, 32, anchorStart + 1).then((r) => r.buffer);
             await handle.close();
@@ -193,3 +191,3 @@ return anchorBuffer;
         const tagsStart = await this.getTagsStart();
-        const numberOfTagsBuffer = await read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart).then((r) => r.buffer);
+        const numberOfTagsBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart).then((r) => r.buffer);
         const numberOfTags = utils_1.byteArrayToLong(numberOfTagsBuffer);
@@ -200,3 +198,3 @@ if (numberOfTags === 0) {
         }
-        const numberOfTagsBytesBuffer = await read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((r) => r.buffer);
+        const numberOfTagsBytesBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((r) => r.buffer);
         const numberOfTagsBytes = utils_1.byteArrayToLong(numberOfTagsBytesBuffer);
@@ -207,3 +205,3 @@ if (numberOfTagsBytes > 2048) {
         }
-        const tagsBytes = await read(handle.fd, Buffer.allocUnsafe(numberOfTagsBytes), 0, numberOfTagsBytes, tagsStart + 16).then((r) => r.buffer);
+        const tagsBytes = await file_1.read(handle.fd, Buffer.allocUnsafe(numberOfTagsBytes), 0, numberOfTagsBytes, tagsStart + 16).then((r) => r.buffer);
         await handle.close();
@@ -226,3 +224,3 @@ return tagsBytes;
         const handle = await fs.promises.open(this.filename, "r");
-        const dataBuffer = await read(handle.fd, Buffer.allocUnsafe(dataSize), 0, dataSize, dataStart).then((r) => r.buffer);
+        const dataBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(dataSize), 0, dataSize, dataStart).then((r) => r.buffer);
         await handle.close();
@@ -249,3 +247,3 @@ return dataBuffer;
         const handle = await fs.promises.open(this.filename, "r+");
-        await write(handle.fd, signatureBytes, 0, await this.signatureLength(), 2);
+        await file_1.write(handle.fd, signatureBytes, 0, await this.signatureLength(), 2);
         this.rawId = Buffer.from(idBytes);
@@ -283,3 +281,3 @@ await handle.close();
         const tagsStart = await this.getTagsStart();
-        const numberOfTagsBytesBuffer = await read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((r) => r.buffer);
+        const numberOfTagsBytesBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(8), 0, 8, tagsStart + 8).then((r) => r.buffer);
         const numberOfTagsBytes = utils_1.byteArrayToLong(numberOfTagsBytesBuffer);
@@ -292,6 +290,6 @@ await handle.close();
         const handle = await fs.promises.open(this.filename, "r");
-        const targetPresentBuffer = await read(handle.fd, Buffer.allocUnsafe(1), 0, 1, targetStart).then((r) => r.buffer);
+        const targetPresentBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(1), 0, 1, targetStart).then((r) => r.buffer);
         const targetPresent = targetPresentBuffer[0] === 1;
         const anchorStart = targetStart + (targetPresent ? 33 : 1);
-        const anchorPresentBuffer = await read(handle.fd, Buffer.allocUnsafe(1), 0, 1, anchorStart).then((r) => r.buffer);
+        const anchorPresentBuffer = await file_1.read(handle.fd, Buffer.allocUnsafe(1), 0, 1, anchorStart).then((r) => r.buffer);
         const anchorPresent = anchorPresentBuffer[0] === 1;
@@ -298,0 +296,0 @@ await handle.close();

package.json

 {
   "name": "arbundles",
-  "version": "0.6.17-rc1",
+  "version": "0.7.0-rc1",
   "description": "Arweave bundling library",
@@ -8,2 +8,3 @@ "author": "Josh Benaron <[e-mail]>",
   "main": "src/index.js",
+  "browser": "esm/shim.js",
   "types": "index.d.ts",
@@ -22,6 +23,15 @@ "files": [
     "file/**/*.js.map",
-    "file/**/*.d.ts"
+    "file/**/*.d.ts",
+    "esm/**/*.js",
+    "esm/**/*.js.map",
+    "esm/**/*.d.ts",
+    "shim.js",
+    "shim.d.ts",
+    "shim.js.map",
+    "standaloneShim.js",
+    "standaloneShim.d.ts",
+    "standaloneShim.js/map"
   ],
   "scripts": {
-    "build": "tsc",
+    "build": "tsc -p tsconfig.json && tsc -p esm.tsconfig.json && webpack",
     "lint": "eslint ./src -c ./.eslintrc.json --ext .ts,.tsx",
@@ -35,6 +45,20 @@ "test": "jest --coverage",
   "devDependencies": {
+    "@metamask/eth-sig-util": "^4.0.0",
+    "@noble/ed25519": "^1.6.0",
+    "@randlabs/myalgo-connect": "^1.1.2",
+    "@solana/wallet-adapter-base": "^0.9.2",
+    "@types/bs58": "^4.0.1",
     "@types/jest": "~26.0.23",
+    "@types/multistream": "^2.1.1",
     "@types/node": "^17.0.10",
+    "@types/secp256k1": "^4.0.3",
     "@typescript-eslint/eslint-plugin": "~4.25.0",
     "@typescript-eslint/parser": "~4.25.0",
+    "algosdk": "^1.13.1",
+    "arweave": "^1.10.18",
+    "assert": "^2.0.0",
+    "axios": "^0.21.3",
+    "base64url": "^3.0.1",
+    "browserify-zlib": "^0.2.0",
+    "bs58": "^4.0.1",
     "eslint": "~7.27.0",
@@ -44,20 +68,24 @@ "eslint-config-prettier": "~8.3.0",
     "husky": "^7.0.0",
+    "inspectpack": "^4.7.1",
     "jest": "~27.0.3",
+    "keccak": "^3.0.2",
     "object-sizeof": "^1.6.1",
+    "path-browserify": "^1.0.1",
     "perf_hooks": "^0.0.1",
     "prettier": "~2.3.0",
     "pretty-quick": "^3.1.2",
+    "process": "^0.11.10",
     "rimraf": "~3.0.2",
     "ts-jest": "~27.0.2",
+    "ts-loader": "^9.2.8",
+    "ts-node": "^10.5.0",
+    "tslib": "^2.3.0",
     "tsutils": "~3.21.0",
-    "typescript": "~4.3.2"
+    "typescript": "~4.3.2",
+    "webpack": "^5.71.0",
+    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-cli": "^4.9.2"
   },
   "dependencies": {
-    "@randlabs/myalgo-connect": "^1.1.2",
-    "@solana/wallet-adapter-base": "^0.9.2",
-    "@types/axios": "^0.14.0",
-    "@types/bs58": "^4.0.1",
-    "@types/multistream": "^2.1.1",
-    "@types/secp256k1": "^4.0.3",
-    "algosdk": "^1.13.1",
+    "@noble/ed25519": "^1.6.0",
     "arweave": "^1.10.18",
@@ -69,13 +97,10 @@ "arweave-stream-tx": "^1.1.0",
     "bs58": "^4.0.1",
-    "buffer": "npm:buffer",
-    "ethers": "^5.5.1",
+    "buffer": "^6.0.3",
+    "crypto-browserify": "^3.12.0",
     "keccak": "^3.0.2",
     "multistream": "^4.1.0",
-    "noble-ed25519": "^1.2.6",
-    "process": "^0.11.10",
     "secp256k1": "^4.0.2",
-    "tmp-promise": "^3.0.2",
-    "ts-node": "^10.5.0",
-    "tslib": "^2.3.0"
+    "stream-browserify": "^3.0.0",
+    "tmp-promise": "^3.0.2"
   }
 }

src/DataItem.js

@@ -30,5 +30,5 @@ "use strict";
 const buffer_1 = require("buffer");
-const ar_data_bundle_1 = require("./ar-data-bundle");
+const arDataBundle_1 = require("./arDataBundle");
 const index_1 = require("./signing/index");
-const ar_data_base_1 = require("./ar-data-base");
+const arDataBase_1 = require("./arDataBase");
 const axios_1 = __importDefault(require("axios"));
@@ -163,3 +163,3 @@ const constants_1 = require("./constants");
     async sign(signer) {
-        this._id = await ar_data_bundle_1.sign(this, signer);
+        this._id = await arDataBundle_1.sign(this, signer);
         return this.rawId;
@@ -236,7 +236,7 @@ }
         const Signer = index_1.indexToType[sigType];
-        const signatureData = await ar_data_base_1.getSignatureData(item);
+        const signatureData = await arDataBase_1.getSignatureData(item);
         return await Signer.verify(item.rawOwner, signatureData, item.rawSignature);
     }
     async getSignatureData() {
-        return ar_data_base_1.getSignatureData(this);
+        return arDataBase_1.getSignatureData(this);
     }
@@ -243,0 +243,0 @@ /**

src/index.d.ts

@@ -1,7 +0,7 @@
-import { bundleAndSignData, unbundleData } from "./ar-data-bundle";
+import { bundleAndSignData, unbundleData } from "./arDataBundle";
 import Bundle from "./Bundle";
 import DataItem, { MIN_BINARY_SIZE } from "./DataItem";
 import { deepHash } from "./deepHash";
-import { DataItemCreateOptions } from "./ar-data-base";
-import { createData } from "./ar-data-create";
+import { DataItemCreateOptions } from "./arDataBase";
+import { createData } from "./arDataCreate";
 import { ArweaveSigner } from "./signing";
@@ -8,0 +8,0 @@ import SolanaSigner from "./signing/chains/SolanaSigner";

src/index.js

@@ -26,5 +26,5 @@ "use strict";
 exports.signers = exports.deepHash = exports.unbundleData = exports.bundleAndSignData = exports.createData = exports.DataItem = exports.Bundle = exports.MIN_BINARY_SIZE = void 0;
-const ar_data_bundle_1 = require("./ar-data-bundle");
-Object.defineProperty(exports, "bundleAndSignData", { enumerable: true, get: function () { return ar_data_bundle_1.bundleAndSignData; } });
-Object.defineProperty(exports, "unbundleData", { enumerable: true, get: function () { return ar_data_bundle_1.unbundleData; } });
+const arDataBundle_1 = require("./arDataBundle");
+Object.defineProperty(exports, "bundleAndSignData", { enumerable: true, get: function () { return arDataBundle_1.bundleAndSignData; } });
+Object.defineProperty(exports, "unbundleData", { enumerable: true, get: function () { return arDataBundle_1.unbundleData; } });
 const Bundle_1 = __importDefault(require("./Bundle"));
@@ -37,4 +37,4 @@ exports.Bundle = Bundle_1.default;
 Object.defineProperty(exports, "deepHash", { enumerable: true, get: function () { return deepHash_1.deepHash; } });
-const ar_data_create_1 = require("./ar-data-create");
-Object.defineProperty(exports, "createData", { enumerable: true, get: function () { return ar_data_create_1.createData; } });
+const arDataCreate_1 = require("./arDataCreate");
+Object.defineProperty(exports, "createData", { enumerable: true, get: function () { return arDataCreate_1.createData; } });
 const signing_1 = require("./signing");
@@ -41,0 +41,0 @@ const SolanaSigner_1 = __importDefault(require("./signing/chains/SolanaSigner"));

src/signing/chains/ethereumSigner.js

@@ -8,3 +8,5 @@ "use strict";
 const secp256k1_2 = __importDefault(require("secp256k1"));
-const ethers_1 = require("ethers");
+// import { Wallet, utils } from "ethers"
+const eth_sig_util_1 = require("@metamask/eth-sig-util");
+const keccak256_1 = __importDefault(require("../keccak256"));
 class EthereumSigner extends secp256k1_1.default {
@@ -20,10 +22,27 @@ get publicKey() {
     sign(message) {
-        const wallet = new ethers_1.ethers.Wallet(this._key);
-        return wallet
-            .signMessage(message)
-            .then((r) => Buffer.from(r.slice(2), "hex"));
+        return Buffer.from(eth_sig_util_1.personalSign({
+            privateKey: Buffer.from(this._key, "hex"),
+            data: message,
+        }).slice(2));
+        // const wallet = new Wallet(this._key);
+        // const sig = wallet
+        //   .signMessage(message)
+        //   .then((r) => Buffer.from(r.slice(2), "hex")) as any;
     }
     static async verify(pk, message, signature) {
-        const address = ethers_1.ethers.utils.computeAddress(pk);
-        return ethers_1.ethers.utils.verifyMessage(message, signature) === address;
+        // const address = utils.computeAddress(pk);
+        // return utils.verifyMessage(message, signature) === address;
+        const address = "0x" + keccak256_1.default(pk.slice(1)).slice(-20).toString("hex");
+        let _message = Buffer.from(message).toString("hex");
+        if (_message.slice(0, 2) != "0x") {
+            _message = "0x" + _message;
+        }
+        let _signature = Buffer.from(signature).toString("hex");
+        if (_signature.slice(0, 2) != "0x") {
+            _signature = "0x" + _signature;
+        }
+        return (eth_sig_util_1.recoverPersonalSignature({
+            data: _message,
+            signature: _signature,
+        }) === address);
     }
@@ -30,0 +49,0 @@ }

src/signing/chains/index.d.ts

@@ -1,11 +0,4 @@
-import ArweaveSigner from "./ArweaveSigner";
+export { default as ArweaveSigner } from "./ArweaveSigner";
 export * from "./ethereumSigner";
-import PolygonSigner from "./PolygonSigner";
 export * from "./SolanaSigner";
-import InjectedEthereumSigner from "./injectedEthereumSigner";
-export { default as InjectedSolanaSigner } from "./injectedSolanaSigner";
-export { ArweaveSigner, PolygonSigner, InjectedEthereumSigner };
-export { default as NearSigner } from "./NearSigner";
-export { default as AlgorandSigner } from "./AlgorandSigner";
-export { default as HexInjectedSolanaSigner } from "./HexInjectedSolanaSigner";
 export { default as HexSolanaSigner } from "./HexSolanaSigner";

src/signing/chains/index.js

@@ -16,21 +16,17 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HexSolanaSigner = exports.HexInjectedSolanaSigner = exports.AlgorandSigner = exports.NearSigner = exports.InjectedEthereumSigner = exports.PolygonSigner = exports.ArweaveSigner = exports.InjectedSolanaSigner = void 0;
-const ArweaveSigner_1 = __importDefault(require("./ArweaveSigner"));
-exports.ArweaveSigner = ArweaveSigner_1.default;
+exports.HexSolanaSigner = exports.ArweaveSigner = void 0;
+var ArweaveSigner_1 = require("./ArweaveSigner");
+Object.defineProperty(exports, "ArweaveSigner", { enumerable: true, get: function () { return __importDefault(ArweaveSigner_1).default; } });
 __exportStar(require("./ethereumSigner"), exports);
-const PolygonSigner_1 = __importDefault(require("./PolygonSigner"));
-exports.PolygonSigner = PolygonSigner_1.default;
+// import PolygonSigner from "./PolygonSigner";
 __exportStar(require("./SolanaSigner"), exports);
-const injectedEthereumSigner_1 = __importDefault(require("./injectedEthereumSigner"));
-exports.InjectedEthereumSigner = injectedEthereumSigner_1.default;
-var injectedSolanaSigner_1 = require("./injectedSolanaSigner");
-Object.defineProperty(exports, "InjectedSolanaSigner", { enumerable: true, get: function () { return __importDefault(injectedSolanaSigner_1).default; } });
-var NearSigner_1 = require("./NearSigner");
-Object.defineProperty(exports, "NearSigner", { enumerable: true, get: function () { return __importDefault(NearSigner_1).default; } });
-var AlgorandSigner_1 = require("./AlgorandSigner");
-Object.defineProperty(exports, "AlgorandSigner", { enumerable: true, get: function () { return __importDefault(AlgorandSigner_1).default; } });
-var HexInjectedSolanaSigner_1 = require("./HexInjectedSolanaSigner");
-Object.defineProperty(exports, "HexInjectedSolanaSigner", { enumerable: true, get: function () { return __importDefault(HexInjectedSolanaSigner_1).default; } });
+// import InjectedEthereumSigner from "./injectedEthereumSigner";
+// export { default as InjectedSolanaSigner } from "./injectedSolanaSigner";
+// import InjectedAlgorandSigner from "./injectedAlgorandSigner";
+// export { InjectedAlgorandSigner } from "./injectedAlgorandSigner";
+// export { default as NearSigner } from "./NearSigner";
+// export { default as AlgorandSigner } from "./AlgorandSigner";
+// export { default as HexInjectedSolanaSigner } from "./HexInjectedSolanaSigner";
 var HexSolanaSigner_1 = require("./HexSolanaSigner");
 Object.defineProperty(exports, "HexSolanaSigner", { enumerable: true, get: function () { return __importDefault(HexSolanaSigner_1).default; } });
 //# sourceMappingURL=index.js.map

src/signing/constants.js

@@ -22,4 +22,4 @@ "use strict";
     // @ts-ignore
-    4: chains_1.HexInjectedSolanaSigner,
+    4: chains_1.HexSolanaSigner,
 };
 //# sourceMappingURL=constants.js.map

src/signing/keccak256.d.ts

 /// <reference types="node" />
 import BN from "bn.js";
 import { Buffer } from "buffer";
-declare function keccak256(value: Buffer | BN | string | number): any;
-export = keccak256;
+export default function keccak256(value: Buffer | BN | string | number): any;

src/signing/keccak256.js

@@ -5,2 +5,3 @@ "use strict";
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
@@ -16,2 +17,3 @@ const bn_js_1 = __importDefault(require("bn.js"));
 }
+exports.default = keccak256;
 function toBuffer(value) {
@@ -92,3 +94,2 @@ if (!buffer_1.Buffer.isBuffer(value)) {
 }
-module.exports = keccak256;
 //# sourceMappingURL=keccak256.js.map

src/signing/keys/curve25519.d.ts

 /// <reference types="node" />
-import { Signer } from '../Signer';
+import { Signer } from "../Signer";
 export default class Curve25519 implements Signer {
@@ -4,0 +4,0 @@ protected _key: string;

src/signing/keys/curve25519.js

@@ -26,3 +26,3 @@ "use strict";
 const base64url_1 = __importDefault(require("base64url"));
-const ed25519 = __importStar(require("noble-ed25519"));
+const ed25519 = __importStar(require("@noble/ed25519"));
 const constants_1 = require("../../constants");
@@ -29,0 +29,0 @@ class Curve25519 {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Wildcard dependency

Quality

Package has a dependency with a floating version range. This can cause issues if the dependency publishes a new major version.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

9003180

increased by4067.1%

Dependency count

14

decreased by-39.13%

Number of package files

252

increased by95.35%

Lines of code

12543

increased by300.48%

Number of medium quality alerts

0

decreased by-100%

Worsened metrics

Dev dependency count

41

increased by141.18%

Number of low supply chain risk alerts

11

increased by83.33%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Added@noble/ed25519@^1.6.0

• + Addedcrypto-browserify@^3.12.0

• + Addedstream-browserify@^3.0.0

• + Added@noble/ed25519@1.7.3(transitive)

• + Addedasn1.js@4.10.1(transitive)

• + Addedbrowserify-aes@1.2.0(transitive)

• + Addedbrowserify-cipher@1.0.1(transitive)

• + Addedbrowserify-des@1.0.2(transitive)

• + Addedbrowserify-rsa@4.1.1(transitive)

• + Addedbrowserify-sign@4.2.3(transitive)

• + Addedbuffer-xor@1.0.3(transitive)

• + Addedcipher-base@1.0.4(transitive)

• + Addedcore-util-is@1.0.3(transitive)

• + Addedcreate-ecdh@4.0.4(transitive)

• + Addedcreate-hash@1.2.0(transitive)

• + Addedcreate-hmac@1.1.7(transitive)

• + Addedcrypto-browserify@3.12.0(transitive)

• + Addeddes.js@1.1.0(transitive)

• + Addeddiffie-hellman@5.0.3(transitive)

• + Addedelliptic@6.5.7(transitive)

• + Addedevp_bytestokey@1.0.3(transitive)

• + Addedhash-base@3.0.4(transitive)

• + Addedisarray@1.0.0(transitive)

• + Addedmd5.js@1.3.5(transitive)

• + Addedmiller-rabin@4.0.1(transitive)

• + Addedparse-asn1@5.1.7(transitive)

• + Addedpbkdf2@3.1.2(transitive)

• + Addedprocess-nextick-args@2.0.1(transitive)

• + Addedpublic-encrypt@4.0.3(transitive)

• + Addedrandombytes@2.1.0(transitive)

• + Addedrandomfill@1.0.4(transitive)

• + Addedreadable-stream@2.3.8(transitive)

• + Addedripemd160@2.0.2(transitive)

• + Addedsafe-buffer@5.1.2(transitive)

• + Addedsha.js@2.4.11(transitive)

• + Addedstream-browserify@3.0.0(transitive)

• + Addedstring_decoder@1.1.1(transitive)

• - Removed@randlabs/myalgo-connect@^1.1.2

• - Removed@solana/wallet-adapter-base@^0.9.2

• - Removed@types/axios@^0.14.0

• - Removed@types/bs58@^4.0.1

• - Removed@types/multistream@^2.1.1

• - Removed@types/secp256k1@^4.0.3

• - Removedalgosdk@^1.13.1

• - Removedethers@^5.5.1

• - Removednoble-ed25519@^1.2.6

• - Removedprocess@^0.11.10

• - Removedts-node@^10.5.0

• - Removedtslib@^2.3.0

• - Removed@babel/runtime@7.25.7(transitive)

• - Removed@cspotcode/source-map-support@0.8.1(transitive)

• - Removed@ethersproject/abi@5.7.0(transitive)

• - Removed@ethersproject/abstract-provider@5.7.0(transitive)

• - Removed@ethersproject/abstract-signer@5.7.0(transitive)

• - Removed@ethersproject/address@5.7.0(transitive)

• - Removed@ethersproject/base64@5.7.0(transitive)

• - Removed@ethersproject/basex@5.7.0(transitive)

• - Removed@ethersproject/bignumber@5.7.0(transitive)

• - Removed@ethersproject/bytes@5.7.0(transitive)

• - Removed@ethersproject/constants@5.7.0(transitive)

• - Removed@ethersproject/contracts@5.7.0(transitive)

• - Removed@ethersproject/hash@5.7.0(transitive)

• - Removed@ethersproject/hdnode@5.7.0(transitive)

• - Removed@ethersproject/json-wallets@5.7.0(transitive)

• - Removed@ethersproject/keccak256@5.7.0(transitive)

• - Removed@ethersproject/logger@5.7.0(transitive)

• - Removed@ethersproject/networks@5.7.1(transitive)

• - Removed@ethersproject/pbkdf2@5.7.0(transitive)

• - Removed@ethersproject/properties@5.7.0(transitive)

• - Removed@ethersproject/providers@5.7.2(transitive)

• - Removed@ethersproject/random@5.7.0(transitive)

• - Removed@ethersproject/rlp@5.7.0(transitive)

• - Removed@ethersproject/sha2@5.7.0(transitive)

• - Removed@ethersproject/signing-key@5.7.0(transitive)

• - Removed@ethersproject/solidity@5.7.0(transitive)

• - Removed@ethersproject/strings@5.7.0(transitive)

• - Removed@ethersproject/transactions@5.7.0(transitive)

• - Removed@ethersproject/units@5.7.0(transitive)

• - Removed@ethersproject/wallet@5.7.0(transitive)

• - Removed@ethersproject/web@5.7.1(transitive)

• - Removed@ethersproject/wordlists@5.7.0(transitive)

• - Removed@jridgewell/resolve-uri@3.1.2(transitive)

• - Removed@jridgewell/sourcemap-codec@1.5.0(transitive)

• - Removed@jridgewell/trace-mapping@0.3.9(transitive)

• - Removed@noble/curves@1.6.0(transitive)

• - Removed@noble/hashes@1.5.0(transitive)

• - Removed@randlabs/communication-bridge@1.0.1(transitive)

• - Removed@randlabs/myalgo-connect@1.4.2(transitive)

• - Removed@solana/buffer-layout@4.0.1(transitive)

• - Removed@solana/wallet-adapter-base@0.9.23(transitive)

• - Removed@solana/wallet-standard-features@1.2.0(transitive)

• - Removed@solana/web3.js@1.95.3(transitive)

• - Removed@swc/helpers@0.5.13(transitive)

• - Removed@tsconfig/node10@1.0.11(transitive)

• - Removed@tsconfig/node12@1.0.11(transitive)

• - Removed@tsconfig/node14@1.0.3(transitive)

• - Removed@tsconfig/node16@1.0.4(transitive)

• - Removed@types/axios@0.14.0(transitive)

• - Removed@types/bs58@4.0.4(transitive)

• - Removed@types/connect@3.4.38(transitive)

• - Removed@types/multistream@2.1.2(transitive)

• - Removed@types/node@12.20.5522.7.4(transitive)

• - Removed@types/secp256k1@4.0.6(transitive)

• - Removed@types/uuid@8.3.4(transitive)

• - Removed@types/ws@7.4.78.5.12(transitive)

• - Removed@wallet-standard/base@1.0.1(transitive)

• - Removed@wallet-standard/features@1.0.3(transitive)

• - RemovedJSONStream@1.3.5(transitive)

• - Removedacorn@8.12.1(transitive)

• - Removedacorn-walk@8.3.4(transitive)

• - Removedaes-js@3.0.0(transitive)

• - Removedagentkeepalive@4.5.0(transitive)

• - Removedalgo-msgpack-with-bigint@2.1.1(transitive)

• - Removedalgosdk@1.24.1(transitive)

• - Removedarg@4.1.3(transitive)

• - Removedbech32@1.1.4(transitive)

• - Removedbigint-buffer@1.1.5(transitive)

• - Removedbindings@1.5.0(transitive)

• - Removedborsh@0.7.0(transitive)

• - Removedbufferutil@4.0.8(transitive)

• - Removedcommander@2.20.3(transitive)

• - Removedcreate-require@1.1.1(transitive)

• - Removedcross-fetch@3.1.8(transitive)

• - Removeddelay@5.0.0(transitive)

• - Removeddiff@4.0.2(transitive)

• - Removedelliptic@6.5.4(transitive)

• - Removedes6-promise@4.2.8(transitive)

• - Removedes6-promisify@5.0.0(transitive)

• - Removedethers@5.7.2(transitive)

• - Removedeventemitter3@4.0.75.0.1(transitive)

• - Removedeyes@0.1.8(transitive)

• - Removedfast-stable-stringify@1.0.0(transitive)

• - Removedfile-uri-to-path@1.0.0(transitive)

• - Removedhi-base32@0.5.1(transitive)

• - Removedhumanize-ms@1.2.1(transitive)

• - Removedisomorphic-ws@4.0.1(transitive)

• - Removedjayson@4.1.2(transitive)

• - Removedjs-sha256@0.9.0(transitive)

• - Removedjs-sha3@0.8.0(transitive)

• - Removedjs-sha512@0.8.0(transitive)

• - Removedjson-bigint@1.0.0(transitive)

• - Removedjson-stringify-safe@5.0.1(transitive)

• - Removedjsonparse@1.3.1(transitive)

• - Removedmake-error@1.3.6(transitive)

• - Removedms@2.1.3(transitive)

• - Removednoble-ed25519@1.2.6(transitive)

• - Removednode-fetch@2.7.0(transitive)

• - Removedprocess@0.11.10(transitive)

• - Removedregenerator-runtime@0.14.1(transitive)

• - Removedrpc-websockets@9.0.4(transitive)

• - Removedscrypt-js@3.0.1(transitive)

• - Removedsuperstruct@2.0.2(transitive)

• - Removedtext-encoding-utf-8@1.0.2(transitive)

• - Removedthrough@2.3.8(transitive)

• - Removedtr46@0.0.3(transitive)

• - Removedts-node@10.9.2(transitive)

• - Removedtslib@2.7.0(transitive)

• - Removedtweetnacl@1.0.3(transitive)

• - Removedtypescript@5.6.2(transitive)

• - Removedundici-types@6.19.8(transitive)

• - Removedutf-8-validate@5.0.10(transitive)

• - Removeduuid@8.3.2(transitive)

• - Removedv8-compile-cache-lib@3.0.1(transitive)

• - Removedvlq@2.0.4(transitive)

• - Removedwebidl-conversions@3.0.1(transitive)

• - Removedwhatwg-url@5.0.0(transitive)

• - Removedws@7.4.67.5.108.18.0(transitive)

• - Removedyn@3.1.1(transitive)

• Updatedbuffer@^6.0.3