refactor: incorporate eth-hash-to-cid module

eth-account-snapshot/index.js

@@ -1,6 +1,6 @@
 'use strict'
 const EthAccount = require('ethereumjs-account')
-const cidFromHash = require('eth-hash-to-cid')
+const cidFromHash = require('../util/cidFromHash')
 const createResolver = require('../util/createResolver')
 const emptyCodeHash = require('../util/emptyCodeHash')
 

eth-block-list/index.js

@@ -5,7 +5,7 @@ const asyncify = require('async/asyncify')
 const RLP = require('rlp')
 const EthBlockHead = require('ethereumjs-block/header')
 const multihash = require('multihashing-async')
-const cidFromHash = require('eth-hash-to-cid')
+const cidFromHash = require('../util/cidFromHash')
 const ethBlockResolver = require('../eth-block').resolver
 const createResolver = require('../util/createResolver')
 

eth-block/index.js

@@ -1,6 +1,6 @@
 'use strict'
 const EthBlockHeader = require('ethereumjs-block/header')
-const cidFromHash = require('eth-hash-to-cid')
+const cidFromHash = require('../util/cidFromHash')
 const createResolver = require('../util/createResolver')
 
 module.exports = createResolver('eth-block', EthBlockHeader, mapFromEthObj)

eth-state-trie/test/resolver.spec.js

@@ -10,7 +10,7 @@ const Trie = require('merkle-patricia-tree')
 const TrieNode = require('merkle-patricia-tree/trieNode')
 const multihashing = require('multihashing-async')
 const CID = require('cids')
-const cidFromHash = require('eth-hash-to-cid')
+const cidFromHash = require('../../util/cidFromHash')
 const ipldEthStateTrie = require('../index')
 const isExternalLink = require('../../util/isExternalLink')
 const resolver = ipldEthStateTrie.resolver

package.json

@@ -24,7 +24,6 @@
   "dependencies": {
     "async": "^2.6.0",
     "cids": "~0.5.2",
-    "eth-hash-to-cid": "~0.1.0",
     "ethereumjs-account": "^2.0.4",
     "ethereumjs-block": "^1.7.1",
     "ethereumjs-tx": "^1.3.3",

util/cidFromEthObj.js

@@ -1,5 +1,5 @@
 'use strict'
-const cidFromHash = require('eth-hash-to-cid')
+const cidFromHash = require('./cidFromHash')
 
 module.exports = cidFromEthObj
 

util/cidFromHash.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const CID = require('cids')
+const multihashes = require('multihashes')
+
+module.exports = cidFromHash
+
+function cidFromHash (codec, rawhash) {
+  const multihash = multihashes.encode(rawhash, 'keccak-256')
+  const cidVersion = 1
+  return new CID(cidVersion, codec, multihash)
+}

util/createTrieResolver.js

@@ -4,7 +4,7 @@ const waterfall = require('async/waterfall')
 const asyncify = require('async/asyncify')
 const rlp = require('rlp')
 const EthTrieNode = require('merkle-patricia-tree/trieNode')
-const cidFromHash = require('eth-hash-to-cid')
+const cidFromHash = require('./cidFromHash')
 // const createBaseTrieResolver = require('./createBaseTrieResolver.js')
 const createResolver = require('./createResolver')
 const isExternalLink = require('./isExternalLink')