@ethereumjs/util - npm Package Compare versions

Comparing version 8.0.0 to 8.0.1

dist/account.d.ts

@@ -9,2 +9,3 @@ /// <reference types="node" />
 }
+export declare type AccountBodyBuffer = [Buffer, Buffer, Buffer | Uint8Array, Buffer | Uint8Array];
 export declare class Account {
@@ -120,6 +121,8 @@ nonce: bigint;
 export declare const isZeroAddress: (hexAddress: string) => boolean;
+export declare function accountBodyFromSlim(body: AccountBodyBuffer): (Uint8Array | Buffer)[];
+export declare function accountBodyToSlim(body: AccountBodyBuffer): (Uint8Array | Buffer)[];
 /**
  * Converts a slim account RLP to a normal account RLP
  */
-export declare function convertSlimAccount(body: any): Buffer;
+export declare function accountBodyToRLP(body: AccountBodyBuffer, couldBeSlim?: boolean): Buffer;
 //# sourceMappingURL=account.d.ts.map

dist/account.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertSlimAccount = exports.isZeroAddress = exports.zeroAddress = exports.importPublic = exports.privateToAddress = exports.privateToPublic = exports.publicToAddress = exports.pubToAddress = exports.isValidPublic = exports.isValidPrivate = exports.generateAddress2 = exports.generateAddress = exports.isValidChecksumAddress = exports.toChecksumAddress = exports.isValidAddress = exports.Account = void 0;
+exports.accountBodyToRLP = exports.accountBodyToSlim = exports.accountBodyFromSlim = exports.isZeroAddress = exports.zeroAddress = exports.importPublic = exports.privateToAddress = exports.privateToPublic = exports.publicToAddress = exports.pubToAddress = exports.isValidPublic = exports.isValidPrivate = exports.generateAddress2 = exports.generateAddress = exports.isValidChecksumAddress = exports.toChecksumAddress = exports.isValidAddress = exports.Account = void 0;
 const rlp_1 = require("@ethereumjs/rlp");
@@ -289,18 +289,31 @@ const keccak_1 = require("ethereum-cryptography/keccak");
 exports.isZeroAddress = isZeroAddress;
+function accountBodyFromSlim(body) {
+    const [nonce, balance, storageRoot, codeHash] = body;
+    return [
+        nonce,
+        balance,
+        (0, bytes_1.arrToBufArr)(storageRoot).length === 0 ? constants_1.KECCAK256_RLP : storageRoot,
+        (0, bytes_1.arrToBufArr)(codeHash).length === 0 ? constants_1.KECCAK256_NULL : codeHash,
+    ];
+}
+exports.accountBodyFromSlim = accountBodyFromSlim;
+const emptyUint8Arr = new Uint8Array(0);
+function accountBodyToSlim(body) {
+    const [nonce, balance, storageRoot, codeHash] = body;
+    return [
+        nonce,
+        balance,
+        (0, bytes_1.arrToBufArr)(storageRoot).equals(constants_1.KECCAK256_RLP) ? emptyUint8Arr : storageRoot,
+        (0, bytes_1.arrToBufArr)(codeHash).equals(constants_1.KECCAK256_NULL) ? emptyUint8Arr : codeHash,
+    ];
+}
+exports.accountBodyToSlim = accountBodyToSlim;
 /**
  * Converts a slim account RLP to a normal account RLP
  */
-function convertSlimAccount(body) {
-    const cpy = [body[0], body[1], body[2], body[3]];
-    if ((0, bytes_1.arrToBufArr)(body[2]).length === 0) {
-        // StorageRoot
-        cpy[2] = constants_1.KECCAK256_RLP;
-    }
-    if ((0, bytes_1.arrToBufArr)(body[3]).length === 0) {
-        // CodeHash
-        cpy[3] = constants_1.KECCAK256_NULL;
-    }
-    return (0, bytes_1.arrToBufArr)(rlp_1.RLP.encode(cpy));
+function accountBodyToRLP(body, couldBeSlim = true) {
+    const accountBody = couldBeSlim ? accountBodyFromSlim(body) : body;
+    return (0, bytes_1.arrToBufArr)(rlp_1.RLP.encode(accountBody));
 }
-exports.convertSlimAccount = convertSlimAccount;
+exports.accountBodyToRLP = accountBodyToRLP;
 //# sourceMappingURL=account.js.map

dist/index.d.ts

@@ -29,2 +29,3 @@ /**
 export { arrayContainsArray, fromAscii, fromUtf8, getBinarySize, getKeys, isHexPrefixed, isHexString, padToEven, stripHexPrefix, toAscii, } from './internal';
+export * from './lock';
 //# sourceMappingURL=index.d.ts.map

dist/index.js

@@ -56,2 +56,3 @@ "use strict";
 Object.defineProperty(exports, "toAscii", { enumerable: true, get: function () { return internal_1.toAscii; } });
+__exportStar(require("./lock"), exports);
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@ethereumjs/util",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "A collection of utility functions for Ethereum",
@@ -5,0 +5,0 @@ "keywords": [

src/account.ts

@@ -30,2 +30,4 @@ import { RLP } from '@ethereumjs/rlp'
 
+export type AccountBodyBuffer = [Buffer, Buffer, Buffer | Uint8Array, Buffer | Uint8Array]
+
 export class Account {
@@ -346,16 +348,29 @@ nonce: bigint
 
+export function accountBodyFromSlim(body: AccountBodyBuffer) {
+  const [nonce, balance, storageRoot, codeHash] = body
+  return [
+    nonce,
+    balance,
+    arrToBufArr(storageRoot).length === 0 ? KECCAK256_RLP : storageRoot,
+    arrToBufArr(codeHash).length === 0 ? KECCAK256_NULL : codeHash,
+  ]
+}
+
+const emptyUint8Arr = new Uint8Array(0)
+export function accountBodyToSlim(body: AccountBodyBuffer) {
+  const [nonce, balance, storageRoot, codeHash] = body
+  return [
+    nonce,
+    balance,
+    arrToBufArr(storageRoot).equals(KECCAK256_RLP) ? emptyUint8Arr : storageRoot,
+    arrToBufArr(codeHash).equals(KECCAK256_NULL) ? emptyUint8Arr : codeHash,
+  ]
+}
+
 /**
  * Converts a slim account RLP to a normal account RLP
  */
-export function convertSlimAccount(body: any) {
-  const cpy = [body[0], body[1], body[2], body[3]]
-  if (arrToBufArr(body[2]).length === 0) {
-    // StorageRoot
-    cpy[2] = KECCAK256_RLP
-  }
-  if (arrToBufArr(body[3]).length === 0) {
-    // CodeHash
-    cpy[3] = KECCAK256_NULL
-  }
-  return arrToBufArr(RLP.encode(cpy))
+export function accountBodyToRLP(body: AccountBodyBuffer, couldBeSlim = true) {
+  const accountBody = couldBeSlim ? accountBodyFromSlim(body) : body
+  return arrToBufArr(RLP.encode(accountBody))
 }

src/index.ts

@@ -46,1 +46,2 @@ /**
 } from './internal'
+export * from './lock'

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

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

Improved metrics

Total package byte prevSize

183838

increased by4.4%

Number of package files

53

increased by10.42%

Lines of code

3421

increased by3.82%

No dependency changes