Commit ba8d161b authored by Iuri Matias's avatar Iuri Matias Committed by Aniket

fix account list; fix newAccount function

parent 98aab3a1
const ethJSUtil = require('ethereumjs-util') const ethJSUtil = require('ethereumjs-util')
const BN = ethJSUtil.BN const { BN, privateToAddress, isValidPrivate } = require('ethereumjs-util')
const Web3 = require('web3') const Web3 = require('web3')
const crypto = require('crypto')
const Accounts = function (executionContext) { const Accounts = function (executionContext) {
this.web3 = new Web3() this.web3 = new Web3()
...@@ -61,9 +62,12 @@ Accounts.prototype._addAccount = function (privateKey, balance) { ...@@ -61,9 +62,12 @@ Accounts.prototype._addAccount = function (privateKey, balance) {
}) })
this.accounts[ethJSUtil.toChecksumAddress('0x' + address.toString('hex'))] = { privateKey, nonce: 0 } this.accounts[ethJSUtil.toChecksumAddress('0x' + address.toString('hex'))] = { privateKey, nonce: 0 }
this.accounts[ethJSUtil.toChecksumAddress('0x' + address.toString('hex'))] = { privateKey, nonce: 0 }
// this.accountsList[ethJSUtil.toChecksumAddress('0x' + address.toString('hex'))] = { privateKey, nonce: 0 }
} }
Accounts.prototype.newAccount = (_passwordPromptCb, cb) => { Accounts.prototype.newAccount = function (cb) {
console.dir("newAccount")
let privateKey let privateKey
do { do {
privateKey = crypto.randomBytes(32) privateKey = crypto.randomBytes(32)
...@@ -81,7 +85,8 @@ Accounts.prototype.methods = function () { ...@@ -81,7 +85,8 @@ Accounts.prototype.methods = function () {
} }
Accounts.prototype.eth_accounts = function (payload, cb) { Accounts.prototype.eth_accounts = function (payload, cb) {
return cb(null, this.accountsList.map((x) => ethJSUtil.toChecksumAddress(x.address))) // return cb(null, this.accountsList.map((x) => ethJSUtil.toChecksumAddress(x.address)))
return cb(null, Object.keys(this.accounts))
} }
Accounts.prototype.eth_getBalance = function (payload, cb) { Accounts.prototype.eth_getBalance = function (payload, cb) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment