Merge 11df2bd into 4d918be

src/baseTrie.js

@@ -28,7 +28,7 @@ module.exports = class Trie {
     this.EMPTY_TRIE_ROOT = ethUtil.KECCAK256_RLP
     this.sem = semaphore(1)
 
-    this.db = db || new DB()
+    this.db = db ? new DB(db) : new DB()
 
     Object.defineProperty(this, 'root', {
       set (value) {
@@ -162,6 +162,31 @@ module.exports = class Trie {
     })
   }
 
+  /**
+   * Retrieves a value directly from key/value db.
+   * @deprecated
+   */
+  getRaw (key, cb) {
+    this.db.get(key, cb)
+  }
+
+  /**
+   * Writes a value under given key directly to the
+   * key/value db.
+   * @deprecated
+   */
+  putRaw (key, value, cb) {
+    this.db.put(key, value, cb)
+  }
+
+  /**
+   * Deletes key directly from underlying key/value db.
+   * @deprecated
+   */
+  delRaw (key, cb) {
+    this.db.del(key, cb)
+  }
+
   // retrieves a node from dbs by hash
   _lookupNode (node, cb) {
     if (TrieNode.isRawNode(node)) {
@@ -696,7 +721,7 @@ module.exports = class Trie {
   // and starting at the same root
   copy () {
     const db = this.db.copy()
-    return new Trie(db, this.root)
+    return new Trie(db._leveldb, this.root)
   }
 
   /**

src/checkpointTrie.js

@@ -91,19 +91,29 @@ module.exports = class CheckpointTrie extends BaseTrie {
    * Returns a copy of the underlying trie with the interface
    * of CheckpointTrie. If during a checkpoint, the copy will
    * contain the checkpointing metadata (incl. reference to the same scratch).
-   * @method copy
+   * @param {boolean} includeCheckpoints - If true and during a checkpoint, the copy will
+   * contain the checkpointing metadata and will use the same scratch as underlying db.
    */
-  copy () {
+  copy (includeCheckpoints = true) {
     const db = this._mainDB.copy()
-    const trie = new CheckpointTrie(db, this.root)
-    if (this.isCheckpoint) {
+    const trie = new CheckpointTrie(db._leveldb, this.root)
+    if (includeCheckpoints && this.isCheckpoint) {
       trie._checkpoints = this._checkpoints.slice()
       trie._scratch = this._scratch.copy()
       trie.db = trie._scratch
     }
     return trie
   }
 
+  /**
+   * Writes a value under given key directly to the
+   * key/value db, disregarding checkpoints.
+   * @deprecated
+   */
+  putRaw (key, value, cb) {
+    this._mainDB.put(key, value, cb)
+  }
+
   /**
    * Enter into checkpoint mode.
    * @private
@@ -124,7 +134,7 @@ module.exports = class CheckpointTrie extends BaseTrie {
 
     if (commitState) {
       this._createScratchReadStream(scratch)
-        .pipe(WriteStream(this.db))
+        .pipe(WriteStream(this.db._leveldb))
         .on('close', cb)
     } else {
       async.nextTick(cb)
@@ -139,7 +149,8 @@ module.exports = class CheckpointTrie extends BaseTrie {
    */
   _createScratchReadStream (scratch) {
     scratch = scratch || this._scratch
-    const trie = new BaseTrie(scratch, this.root)
+    const trie = new BaseTrie(scratch._leveldb, this.root)
+    trie.db = scratch
     return new ScratchReadStream(trie)
   }
 }

src/secure.js

@@ -25,8 +25,9 @@ module.exports = class SecureTrie extends CheckpointTrie {
   }
 
   copy () {
-    const db = this.db.copy()
-    return new SecureTrie(db, this.root)
+    const trie = super.copy(false)
+    const db = trie.db.copy()
+    return new SecureTrie(db._leveldb, this.root)
   }
 
   get (key, cb) {