Merge pull request ethereumjs#400 from ethereumjs/bug/generateGenesis/parseHex

holgerd77 · web-flow · commit cae775dc1fb9 · 2018-12-05T20:21:16.000+01:00
Fix casting genesis state addresses to buffer
diff --git a/lib/stateManager.js b/lib/stateManager.js
@@ -498,7 +498,7 @@ proto.generateGenesis = function (initState, cb) {
   async.eachSeries(addresses, function (address, done) {
     var account = new Account()
     account.balance = new BN(initState[address]).toArrayLike(Buffer)
-    address = Buffer.from(address, 'hex')
+    address = utils.toBuffer(address)
     self._trie.put(address, account.serialize(), done)
   }, cb)
 }

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ proto.generateGenesis = function (initState, cb) {`
`498`	`498`	`async.eachSeries(addresses, function (address, done) {`
`499`	`499`	`var account = new Account()`
`500`	`500`	`account.balance = new BN(initState[address]).toArrayLike(Buffer)`
`501`		`- address = Buffer.from(address, 'hex')`
	`501`	`+ address = utils.toBuffer(address)`
`502`	`502`	`self._trie.put(address, account.serialize(), done)`
`503`	`503`	`}, cb)`
`504`	`504`	`}`