rename merkle-patricia-tree uses to @ethereumjs/trie

Author: ryanio

packages/block/package.json

@@ -40,10 +40,10 @@
   "homepage": "https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/block#readme",
   "dependencies": {
     "@ethereumjs/common": "^2.0.0",
+    "@ethereumjs/trie": "^4.0.0",
     "@ethereumjs/tx": "^3.0.0",
     "@types/bn.js": "^4.11.6",
-    "ethereumjs-util": "^7.0.7",
-    "merkle-patricia-tree": "^4.0.0"
+    "ethereumjs-util": "^7.0.7"
   },
   "devDependencies": {
     "@ethereumjs/config-coverage": "^2.0.0",

packages/block/src/block.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-dupe-class-members */
 
-import { BaseTrie as Trie } from 'merkle-patricia-tree'
+import { BaseTrie as Trie } from '@ethereumjs/trie'
 import { BN, rlp, keccak256, KECCAK256_RLP } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
 import { Transaction, TxOptions } from '@ethereumjs/tx'

packages/client/README.md

@@ -32,7 +32,7 @@ For the `ethereumjs` CLI command to work run:
 npm link
 ```
 
-Note: for development purposes you can invoke the client by build with `npm run build:node` and 
+Note: for development purposes you can invoke the client by build with `npm run build:node` and
 then run `node ./dist/bin/cli.js`.
 
 ### Running the Client
@@ -45,7 +45,7 @@ You can run the current state of the client with:
 ethereumjs --network=mainnet [--loglevel=debug]
 ```
 
-For development you might want to connect to `rinkeby` as the network with the currently 
+For development you might want to connect to `rinkeby` as the network with the currently
 most reliable connection:
 
 ```shell
@@ -347,9 +347,9 @@ To update the structure diagram files in the root folder open the `client.drawio
 **EthereumJS Ecosystem**
 
 This project will be embedded in the EthereumJS ecosystem and many submodules already exist and
-can be used within the project, have a look e.g. at [ethereumjs-block](https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/block), [ethereumjs-vm](https://github.com/ethereumjs/ethereumjs-vm), the
-[merkle-patricia-tree](https://github.com/ethereumjs/merkle-patricia-tree) or the
-[ethereumjs-devp2p](https://github.com/ethereumjs/vm/packages/devp2p) implementation. Work needs to be done both within this repos and related libraries.
+can be used within the project, have a look e.g. at [@ethereumjs/block](https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/block), [@ethereumjs/vm](https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/vm),
+[@ethereumjs/trie](https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/trie) or the
+[@ethereumjs/devp2p](https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/devp2p) implementation. Work needs to be done both within these repos and related libraries.
 
 ## EthereumJS
 

packages/client/lib/util/parse.ts

@@ -1,6 +1,6 @@
 import { parse } from 'url'
 import { BlockHeader } from '@ethereumjs/block'
-import { SecureTrie as Trie } from 'merkle-patricia-tree'
+import { SecureTrie as Trie } from '@ethereumjs/trie'
 import { Account, BN, keccak, rlp, toBuffer, unpadBuffer, isHexPrefixed } from 'ethereumjs-util'
 import { Bootnode, BootnodeLike, Multiaddrs, MultiaddrsLike } from '../types'
 

packages/client/package.json

@@ -54,6 +54,7 @@
     "@ethereumjs/block": "^3.0.0",
     "@ethereumjs/blockchain": "^5.0.0",
     "@ethereumjs/common": "^2.0.0",
+    "@ethereumjs/trie": "^4.0.0",
     "@ethereumjs/vm": "^5.0.0",
     "chalk": "^2.4.2",
     "ethereumjs-devp2p": "^3.0.3",
@@ -68,7 +69,6 @@
     "libp2p-secio": "^0.11.1",
     "libp2p-tcp": "^0.13.0",
     "libp2p-websockets": "^0.12.0",
-    "merkle-patricia-tree": "^4.0.0",
     "peer-id": "^0.12.2",
     "peer-info": "^0.15.1",
     "pull-catch": "^1.0.0",

packages/trie/CHANGELOG.md

@@ -19,7 +19,7 @@ This release introduces a major API upgrade from callbacks to Promises.
 Example using async/await syntax:
 
 ```typescript
-import { BaseTrie as Trie } from 'merkle-patricia-tree'
+import { BaseTrie as Trie } from '@ethereumjs/trie'
 const trie = new Trie()
 async function test() {
   await trie.put(Buffer.from('test'), Buffer.from('one'))

packages/trie/README.md

@@ -16,7 +16,7 @@ Note: this `README` reflects the state of the library from `v5.0.0` (UNRELEASED)
 
 # INSTALL
 
-`npm install merkle-patricia-tree`
+`npm install @ethereumjs/trie`
 
 # USAGE
 
@@ -26,7 +26,7 @@ There are 3 variants of the tree implemented in this library, namely: `BaseTrie`
 
 ```typescript
 import level from 'level'
-import { BaseTrie as Trie } from 'merkle-patricia-tree'
+import { BaseTrie as Trie } from '@ethereumjs/trie'
 
 const db = level('./testdb')
 const trie = new Trie(db)
@@ -59,7 +59,7 @@ test()
 
 ```typescript
 import level from 'level'
-import { SecureTrie as Trie } from 'merkle-patricia-tree'
+import { SecureTrie as Trie } from '@ethereumjs/trie'
 
 const db = level('YOUR_PATH_TO_THE_GETH_CHAIN_DB')
 // Set stateRoot to block #222
@@ -82,7 +82,7 @@ import level from 'level'
 import rlp from 'rlp'
 import { BN, bufferToHex } from 'ethereumjs-util'
 import Account from 'ethereumjs-account'
-import { SecureTrie as Trie } from 'merkle-patricia-tree'
+import { SecureTrie as Trie } from '@ethereumjs/trie'
 
 const stateRoot = 'STATE_ROOT_OF_A_BLOCK'
 

packages/trie/src/baseTrie.ts

@@ -34,7 +34,7 @@ export type FoundNodeFunction = (
 ) => void
 
 /**
- * The basic trie interface, use with `import { BaseTrie as Trie } from 'merkle-patricia-tree'`.
+ * The basic trie interface, use with `import { BaseTrie as Trie } from '@ethereumjs/trie'`.
  * In Ethereum applications stick with the {@link SecureTrie} overlay.
  * The API for the base and the secure interface are about the same.
  */

packages/trie/src/secure.ts

@@ -4,7 +4,7 @@ import { Proof } from './baseTrie'
 
 /**
  * You can create a secure Trie where the keys are automatically hashed
- * using **keccak256** by using `import { SecureTrie as Trie } from 'merkle-patricia-tree'`.
+ * using **keccak256** by using `import { SecureTrie as Trie } from '@ethereumjs/trie'`.
  * It has the same methods and constructor as `Trie`.
  * @class SecureTrie
  * @extends Trie

packages/vm/lib/index.ts

@@ -1,4 +1,4 @@
-import { SecureTrie as Trie } from 'merkle-patricia-tree'
+import { SecureTrie as Trie } from '@ethereumjs/trie'
 import { Account, Address } from 'ethereumjs-util'
 import Blockchain from '@ethereumjs/blockchain'
 import Common from '@ethereumjs/common'
@@ -61,7 +61,7 @@ export interface VMOpts {
    */
   stateManager?: StateManager
   /**
-   * A [merkle-patricia-tree](https://github.com/ethereumjs/merkle-patricia-tree) instance for the state tree (ignored if stateManager is passed)
+   * An [@ethereumjs/trie](https://github.com/ethereumjs/ethereumjs-vm/tree/master/packages/trie) instance for the state tree (ignored if stateManager is passed)
    * @deprecated
    */
   state?: any // TODO