Merge 4379d37 into 0d81c40

README.md

@@ -35,13 +35,21 @@ You can import the `Wallet` class like this
 Node.js / ES5:
 
 ```js
+// Introduced along v1.0.2 (UNRELEASED)
 const { Wallet } = require('ethereumjs-wallet')
+
+// @deprecated, up till version v1.0.1
+const Wallet = require('ethereumjs-wallet').default
 ```
 
 ESM / TypeScript:
 
 ```js
+// Introduced along v1.0.2 (UNRELEASED)
 import { Wallet } from 'ethereumjs-wallet'
+
+// @deprecated, up till version v1.0.1
+import Wallet from 'ethereumjs-wallet'
 ```
 
 ## Thirdparty API

src/index.ts

@@ -237,7 +237,7 @@ interface EthSaleKeystore {
 
 // wallet implementation
 
-export default class Wallet {
+class Wallet {
   constructor(
     private readonly privateKey?: Buffer | undefined,
     private publicKey: Buffer | undefined = undefined,
@@ -599,7 +599,9 @@ export default class Wallet {
     }
 
     const ciphertext = runCipherBuffer(cipher, this.privKey)
-    const mac = keccak256(Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), Buffer.from(ciphertext)]))
+    const mac = keccak256(
+      Buffer.concat([Buffer.from(derivedKey.slice(16, 32)), Buffer.from(ciphertext)]),
+    )
 
     return {
       version: 3,
@@ -646,6 +648,18 @@ export default class Wallet {
   }
 }
 
+/**
+ * Please note that the default export for Wallet is DEPRECATED and
+ * may be removed in the next major version.
+ * Instead, please use the named export like so:
+ * `import { Wallet } from 'ethereumjs-wallet'`
+ *  or
+ * `const { Wallet } = require('ethereumjs-wallet')`
+ */
+export default Wallet
+
+export { Wallet }
+
 // helpers
 
 function runCipherBuffer(cipher: crypto.Cipher | crypto.Decipher, data: Buffer): Buffer {