seedhammer/dcrd
seedhammer/dcrd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpctest: Update for hdkeychain API changes.

Browse Source
This commit is contained in:
Dave Collins 2020-02-14 19:28:43 -06:00
parent 7487bc9360
commit 397127aca9
No known key found for this signature in database
GPG Key ID: B8904D9D9C93D1F2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpctest/memwallet.go
View File

@ -131,7 +131,7 @@ func newMemWallet(net *chaincfg.Params, harnessID uint32) (*memWallet, error) {
if err != nil {
return nil, err
}
coinbaseKey, err := coinbaseChild.ECPrivKey()
coinbaseKey, err := coinbaseChild.SerializedPrivKey()
if err != nil {
return nil, err
}
@ -147,7 +147,7 @@ func newMemWallet(net *chaincfg.Params, harnessID uint32) (*memWallet, error) {
return &memWallet{
net: net,
coinbaseKey: coinbaseKey,
coinbaseKey: secp256k1.PrivKeyFromBytes(coinbaseKey),
coinbaseAddr: coinbaseAddr,
hdIndex: 1,
hdRoot: hdRoot,
@ -336,7 +336,7 @@ func (m *memWallet) newAddress() (dcrutil.Address, error) {
if err != nil {
return nil, err
}
privKey, err := childKey.ECPrivKey()
privKey, err := childKey.SerializedPrivKey()
if err != nil {
return nil, err
}
@ -487,13 +487,13 @@ func (m *memWallet) CreateTransaction(outputs []*wire.TxOut, feeRate dcrutil.Amo
return nil, err
}
privKey, err := extendedKey.ECPrivKey()
privKey, err := extendedKey.SerializedPrivKey()
if err != nil {
return nil, err
}
sigScript, err := txscript.SignatureScript(tx, i, utxo.pkScript,
txscript.SigHashAll, privKey.Serialize(), dcrec.STEcdsaSecp256k1, true)
txscript.SigHashAll, privKey, dcrec.STEcdsaSecp256k1, true)
if err != nil {
return nil, err
}
@ -554,7 +554,8 @@ func (m *memWallet) ConfirmedBalance() dcrutil.Amount {
}
// keyToAddr maps the passed private to corresponding p2pkh address.
func keyToAddr(key *secp256k1.PrivateKey, net *chaincfg.Params) (dcrutil.Address, error) {
func keyToAddr(serializedPrivKey []byte, net *chaincfg.Params) (dcrutil.Address, error) {
key := secp256k1.PrivKeyFromBytes(serializedPrivKey)
serializedKey := key.PubKey().SerializeCompressed()
pubKeyAddr, err := dcrutil.NewAddressSecpPubKey(serializedKey, net)
if err != nil {