ethereumjs
diff --git a/‎karma.conf.js
Lines changed: 1 addition & 1 deletion b/‎karma.conf.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎package-lock.json
Lines changed: 3991 additions & 2642 deletions b/‎package-lock.json
Lines changed: 3991 additions & 2642 deletions
diff --git a/‎package.json
Lines changed: 35 additions & 38 deletions b/‎package.json
Lines changed: 35 additions & 38 deletions
diff --git a/‎src/hdkey.ts
Lines changed: 10 additions & 8 deletions b/‎src/hdkey.ts
Lines changed: 10 additions & 8 deletions
@@ -1,7 +1,7 @@
 module.exports = function(config) {
   config.set({
     frameworks: ['mocha', 'karma-typescript'],
-    files: ['src/**/*.ts', 'test/**/*.ts'],
+    files: ['src/**/*.ts', 'test/**/*.spec.ts'],
     preprocessors: {
       '**/*.ts': ['karma-typescript'],
     },
 
@@ -10,17 +10,49 @@
     "dist",
     "dist.browser"
   ],
+  "homepage": "https://github.com/ethereumjs/ethereumjs-wallet",
+  "dependencies": {
+    "@ethereumjs/util": "^8.0.0-beta.1",
+    "@scure/base": "^1.1.1",
+    "ethereum-cryptography": "^1.1.0",
+    "js-md5": "0.7.3",
+    "uuid": "8.3.2"
+  },
+  "devDependencies": {
+    "@ethereumjs/config-coverage": "^2.0.0",
+    "@ethereumjs/config-typescript": "^2.0.0",
+    "@ethereumjs/eslint-config-defaults": "^2.0.0",
+    "@types/js-md5": "^0.4.3",
+    "@types/lodash.zip": "4.2.7",
+    "@types/mocha": "9.1.1",
+    "@types/node": "18.0.0",
+    "ethers": "5.6.9",
+    "husky": "4.2.5",
+    "karma": "6.4.0",
+    "karma-chrome-launcher": "3.1.1",
+    "karma-firefox-launcher": "2.1.2",
+    "karma-mocha": "2.0.1",
+    "karma-typescript": "5.5.3",
+    "lodash.zip": "4.2.0",
+    "mocha": "10.0.0",
+    "nyc": "15.1.0",
+    "prettier": "2.6.2",
+    "ts-node": "10.9.1",
+    "typedoc": "0.23.9",
+    "typedoc-plugin-markdown": "3.13.4",
+    "typescript": "4.7.3"
+  },
   "scripts": {
     "postinstall": "npm run build",
-    "build": "tsc -p ./tsconfig.prod.json && tsc -p tsconfig.browser.json",
+    "build": "tsc -p tsconfig.prod.json",
     "prepublishOnly": "npm run lint && npm run build && npm run test",
     "docs:build": "typedoc --out docs --mode file --readme none --theme markdown --mdEngine github --excludeNotExported src",
     "coverage": "npm run build && nyc --reporter=lcov npm run test:unit",
-    "tsc": "tsc -p ./tsconfig.prod.json --noEmit",
+    "tsc": "tsc -p tsconfig.prod.json --noEmit",
     "lint": "ethereumjs-config-lint",
     "lint:fix": "ethereumjs-config-lint-fix",
     "test": "npm run test:unit && npm run test:browser",
-    "test:unit": "mocha --require ts-node/register ./test/**/*.ts",
+    "test:unit": "mocha --require ts-node/register ./test/**/*.spec.ts",
     "test:browser": "karma start karma.conf.js"
   },
   "husky": {
@@ -41,40 +73,5 @@
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/ethereumjs/ethereumjs-wallet/issues"
-  },
-  "homepage": "https://github.com/ethereumjs/ethereumjs-wallet",
-  "dependencies": {
-    "aes-js": "^3.1.2",
-    "bs58check": "^2.1.2",
-    "ethereum-cryptography": "^0.1.3",
-    "ethereumjs-util": "^7.1.2",
-    "randombytes": "^2.1.0",
-    "scrypt-js": "^3.0.1",
-    "utf8": "^3.0.0",
-    "uuid": "^8.3.2"
-  },
-  "devDependencies": {
-    "@ethereumjs/eslint-config-defaults": "^2.0.0",
-    "@ethereumjs/config-coverage": "^2.0.0",
-    "@ethereumjs/config-typescript": "^2.0.0",
-    "@types/bn.js": "^5.1.0",
-    "@types/lodash.zip": "^4.2.6",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^12.0.10",
-    "ethers": "^4.0.33",
-    "husky": "^4.2.5",
-    "karma": "^6.3.4",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^2.1.1",
-    "karma-mocha": "^2.0.1",
-    "karma-typescript": "^5.5.2",
-    "lodash.zip": "^4.2.0",
-    "mocha": "^9.1.2",
-    "nyc": "^15.1.0",
-    "prettier": "^2.4.1",
-    "ts-node": "^10.2.1",
-    "typedoc": "^0.22.5",
-    "typedoc-plugin-markdown": "^3.11.3",
-    "typescript": "^4.4.3"
   }
 }
@@ -1,6 +1,5 @@
-import Wallet from './index'
-
 import { HDKey } from 'ethereum-cryptography/hdkey'
+import Wallet from './index'
 
 export default class EthereumHDKey {
   /**
@@ -20,22 +19,24 @@ export default class EthereumHDKey {
     return new EthereumHDKey(HDKey.fromExtendedKey(base58Key))
   }
 
-  constructor(private readonly _hdkey?: any) {}
+  constructor(private readonly _hdkey: HDKey) {}
 
   /**
    * Returns a BIP32 extended private key (xprv)
    */
-  public privateExtendedKey(): Buffer {
+  public privateExtendedKey(): string {
     if (!this._hdkey.privateExtendedKey) {
       throw new Error('This is a public key only wallet')
     }
+    // return Buffer.from(this._hdkey.privateExtendedKey, 'hex')
     return this._hdkey.privateExtendedKey
   }
 
   /**
    * Return a BIP32 extended public key (xpub)
    */
-  public publicExtendedKey(): Buffer {
+  public publicExtendedKey(): string {
+    // return Buffer.from(this._hdkey.publicExtendedKey, 'hex')
     return this._hdkey.publicExtendedKey
   }
 
@@ -57,9 +58,10 @@ export default class EthereumHDKey {
    * Return a `Wallet` instance as seen above
    */
   public getWallet(): Wallet {
-    if (this._hdkey._privateKey) {
-      return Wallet.fromPrivateKey(this._hdkey._privateKey)
+    if (this._hdkey.privateKey) {
+      return Wallet.fromPrivateKey(Buffer.from(this._hdkey.privateKey))
     }
-    return Wallet.fromPublicKey(this._hdkey._publicKey, true)
+    if (!this._hdkey.publicKey) throw new Error('No hdkey')
+    return Wallet.fromPublicKey(Buffer.from(this._hdkey.publicKey), true)
   }
 }