fix adding accounts to wallet
This commit is contained in:
parent
89845df6f7
commit
af8ca0894d
|
@ -3,12 +3,14 @@ const Web3 = require('web3');
|
||||||
const bip39 = require("bip39");
|
const bip39 = require("bip39");
|
||||||
const hdkey = require('ethereumjs-wallet/hdkey');
|
const hdkey = require('ethereumjs-wallet/hdkey');
|
||||||
const ethUtil = require('ethereumjs-util');
|
const ethUtil = require('ethereumjs-util');
|
||||||
|
const Transaction = require('ethereumjs-tx');
|
||||||
|
|
||||||
class Provider {
|
class Provider {
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.accounts = []
|
this.accounts = []
|
||||||
this.addresses = []
|
this.addresses = []
|
||||||
|
this.nonceCache = {};
|
||||||
this.web3 = new Web3();
|
this.web3 = new Web3();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,13 +23,12 @@ class Provider {
|
||||||
const numAddresses = accountConfig.numAddresses || 1;
|
const numAddresses = accountConfig.numAddresses || 1;
|
||||||
const wallet_hdpath = accountConfig.hdpath || "m/44'/60'/0'/0/";
|
const wallet_hdpath = accountConfig.hdpath || "m/44'/60'/0'/0/";
|
||||||
|
|
||||||
const accounts = [];
|
|
||||||
for (let i = addressIndex; i < addressIndex + numAddresses; i++) {
|
for (let i = addressIndex; i < addressIndex + numAddresses; i++) {
|
||||||
const wallet = hdwallet.derivePath(wallet_hdpath + i).getWallet();
|
const wallet = hdwallet.derivePath(wallet_hdpath + i).getWallet();
|
||||||
//if (returnAddress) {
|
//if (returnAddress) {
|
||||||
this.accounts.push(wallet.getAddressString());
|
// this.accounts.push(wallet.getAddressString());
|
||||||
//} else {
|
//} else {
|
||||||
//accounts.push(Object.assign(web3.eth.accounts.privateKeyToAccount('0x' + wallet.getPrivateKey().toString('hex')), {hexBalance}));
|
this.accounts.push(this.web3.eth.accounts.privateKeyToAccount('0x' + wallet.getPrivateKey().toString('hex')));
|
||||||
//}
|
//}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -86,8 +87,6 @@ class Provider {
|
||||||
const privKey = Buffer.from(key, 'hex');
|
const privKey = Buffer.from(key, 'hex');
|
||||||
tx.sign(privKey);
|
tx.sign(privKey);
|
||||||
payload.params[0] = '0x' + tx.serialize().toString('hex');
|
payload.params[0] = '0x' + tx.serialize().toString('hex');
|
||||||
console.dir("doing send")
|
|
||||||
console.dir(payload)
|
|
||||||
return realSend(payload, (error, result) => {
|
return realSend(payload, (error, result) => {
|
||||||
self.web3.eth.getTransaction(result.result, () => {
|
self.web3.eth.getTransaction(result.result, () => {
|
||||||
callback(error, result);
|
callback(error, result);
|
||||||
|
@ -97,9 +96,6 @@ class Provider {
|
||||||
}, 1);
|
}, 1);
|
||||||
|
|
||||||
self.provider.send = function(payload, cb) {
|
self.provider.send = function(payload, cb) {
|
||||||
console.dir("send")
|
|
||||||
console.dir(payload.method)
|
|
||||||
console.dir(payload)
|
|
||||||
if (payload.method === 'eth_accounts') {
|
if (payload.method === 'eth_accounts') {
|
||||||
return realSend(payload, function(err, result) {
|
return realSend(payload, function(err, result) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
@ -112,8 +108,6 @@ class Provider {
|
||||||
});
|
});
|
||||||
} else if (payload.method === "eth_sendRawTransaction") {
|
} else if (payload.method === "eth_sendRawTransaction") {
|
||||||
return self.runTransaction.push({payload}, cb);
|
return self.runTransaction.push({payload}, cb);
|
||||||
} else if (payload.method === "eth_sendTransaction") {
|
|
||||||
return self.runTransaction.push({payload}, cb);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
realSend(payload, cb);
|
realSend(payload, cb);
|
||||||
|
|
Loading…
Reference in New Issue