Feature/wallet preparetx #24

akekeke · 2018-10-24T09:49:46Z

WIP

need to write testcases

This closes #6

Jwata · 2018-10-29T02:55:24Z

@akekeke
I'm considering restructuring the logic of preparing fund tx from wallet to dlc, so wallet can focus only on preparing txins(and a out if there is charge) from utxos.

akekeke · 2018-11-01T05:00:47Z

Sorry this PR is so large ><; ListUnspent() is longer than I thought it would be.

This PR:

refactored Wallet creation. DB and Wallet creation separated into 2 functions.
implemented ListUnspent(). Its complexity comes from converting Credit type into btcjson.ListUnspentResult type :,(

No test is written for ListUnspent() yet

internal/wallet/utxo.go

internal/wallet/address.go

akekeke · 2018-11-02T09:34:38Z

internal/wallet/wallet.go

@@ -111,7 +112,7 @@ func Create(db walletdb.DB, params *chaincfg.Params, seed, pubPass,

 // Open loads a wallet from the passed db and public pass phrase.
 func Open(db walletdb.DB, pubPass []byte,
-	params *chaincfg.Params) (Wallet, error) {
+	params *chaincfg.Params) (*wallet, error) {


I think this function should return a struct instead of an interface, because the wallet struct already fulfills the Wallet interface.

What do you think? @Jwata

As golint tells us, caller doesn't know about wallet because it's private.

exported func Open returns unexported type *wallet.wallet, which can be annoying to use

Related to this discussion.
golang/lint#210

akekeke · 2018-11-02T09:57:49Z

This PR:

added privatePassphrase as a parameter in the wallet struct
refactored CreateWallet() and Open() to return wallet struct instead of interface
implemented wallet.ListUnspent()

internal/wallet/utxo_test.go

Jwata

I will review more closely later, but leave some comments.
It seems better to work together to finish wallet task as it's getting complicated to manage managers...

Jwata · 2018-11-02T15:10:04Z

internal/wallet/wallet.go

@@ -111,7 +112,7 @@ func Create(db walletdb.DB, params *chaincfg.Params, seed, pubPass,

 // Open loads a wallet from the passed db and public pass phrase.
 func Open(db walletdb.DB, pubPass []byte,
-	params *chaincfg.Params) (Wallet, error) {
+	params *chaincfg.Params) (*wallet, error) {


As golint tells us, caller doesn't know about wallet because it's private.

exported func Open returns unexported type *wallet.wallet, which can be annoying to use

Related to this discussion.
golang/lint#210

Jwata · 2018-11-02T15:19:50Z

internal/wallet/address.go

 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwallet/waddrmgr"
 	"github.com/btcsuite/btcwallet/walletdb"
 )

 func (w *wallet) NewPubkey() (pub *btcec.PublicKey, err error) {
-	// TODO: generate new pubkey and address using newAddress
-	_, err = w.newAddress(waddrmgr.KeyScopeBIP0084, []byte{}, uint32(1), uint32(1))
+	mAddrs, err := w.newAddress(waddrmgr.KeyScopeBIP0084, w.privatePassphrase, uint32(1), uint32(1))


I still wonder why you need private key, though.
I guess the manager already is unlocked? so you don't need to unlock it everytime you write.
https://github.com/btcsuite/btcwallet/blob/c4dd27e481f9801866cf5226bfe532084772ec2a/wallet/wallet.go#L2830

I guess that a private kay was necessary for creating managers, but not for modifying records.

internal/wallet/test_util.go

Jwata · 2018-11-02T15:37:53Z

internal/wallet/utxo.go

+		addrmgrNs := tx.ReadBucket(waddrmgrNamespaceKey)
+		txmgrNs := tx.ReadBucket(wtxmgrNamespaceKey)
+
+		syncBlock := w.manager.SyncedTo()


Does the waddmgr do some block downloading task?
I though it just manages addresses and priv/pub keys of them.

akekeke · 2018-11-05T01:30:20Z

internal/wallet/test_util.go

@@ -48,14 +48,14 @@ func setupDB(t *testing.T) (db walletdb.DB, tearDownFunc func()) {
 	return
 }

-func setupWallet(t *testing.T) (tearDownFunc func(), w Wallet) {
+func setupWallet(t *testing.T) (tearDownFunc func(), w Wallet, db walletdb.DB) {


Some tests need to access the wallet's db directly, so that's why I added db as one of returned values

akekeke · 2018-11-05T01:33:30Z

internal/wallet/wallet.go


+	Manager() *waddrmgr.Manager
+	TxStore() *wtxmgr.Store


Added getter functions so functions that use the Wallet interface have access to wallet's manager and txStore

akekeke · 2018-11-05T01:51:24Z

This PR:

CreateWallet returns a Wallet interface instead of wallet struct (changed from an earlier PR)
added getter functions for wallet's manager and txStore

Jwata

LGTM. Let's finish in next PR.

akekeke added the in progress label Oct 24, 2018

akekeke force-pushed the feature/wallet-preparetx branch from 5b12cef to 4416e31 Compare October 30, 2018 10:21

akekeke commented Nov 1, 2018

View reviewed changes

internal/wallet/utxo.go Outdated Show resolved Hide resolved

akekeke force-pushed the feature/wallet-preparetx branch from aa22de4 to a560051 Compare November 2, 2018 07:04

akekeke commented Nov 2, 2018

View reviewed changes

internal/wallet/utxo_test.go Outdated Show resolved Hide resolved

Jwata reviewed Nov 2, 2018

View reviewed changes

akekeke commented Nov 5, 2018

View reviewed changes

akekeke added 17 commits November 5, 2018 13:27

init port of code from dlcdemo

b92abc0

WIP ported btcwallet code

d5cf21f

added Open func, added txstore to wallet

dbff721

refactored wallet init, seperated wallet and db creation

d45c01a

added listunspent func

aebabaf

fixed lint issues

9d0f19f

added comments and fixed lint

c948351

fixed one xommment

0e63022

init port of code from dlcdemo

860a882

WIP ported btcwallet code

4eb72f8

added listunspent func

efcceb8

fixed lint issues

8cc819d

added comments and fixed lint

aba2632

added one more commmetn

9fc81ce

merge WIP

cbfea64

merge WIP part 2

2551333

refactored methods to return structs instead of interfaces

88dcdc2

akekeke and others added 8 commits November 5, 2018 13:47

cleaned up

e0ebfbd

more cleaning

2cad023

added privpass to wallet struct

c20b49c

moved some func to test_util

eeb6fbe

refactored Wallet interface

74077b0

added back deleted stuff

42cfd05

fixed typo

d2d5285

fix wallet creation (#49)

8b77ef5

Jwata force-pushed the feature/wallet-preparetx branch from 72f1c30 to 8b77ef5 Compare November 5, 2018 04:48

akekeke and others added 3 commits November 5, 2018 14:01

utxo is not pointer anymore

87c24db

cleaned up

98a9c41

fix lint errors

c005e89

Jwata approved these changes Nov 5, 2018

View reviewed changes

akekeke merged commit 22fb197 into master Nov 5, 2018

akekeke removed the in progress label Nov 5, 2018

akekeke deleted the feature/wallet-preparetx branch November 16, 2018 06:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/wallet preparetx #24

Feature/wallet preparetx #24

akekeke commented Oct 24, 2018 •

edited

Loading

Jwata commented Oct 29, 2018

akekeke commented Nov 1, 2018 •

edited

Loading

akekeke Nov 2, 2018

Jwata Nov 2, 2018

akekeke commented Nov 2, 2018

Jwata left a comment

Jwata Nov 2, 2018

Jwata Nov 2, 2018

Jwata Nov 2, 2018

Jwata Nov 2, 2018

akekeke Nov 5, 2018

akekeke Nov 5, 2018

akekeke commented Nov 5, 2018

Jwata left a comment

Feature/wallet preparetx #24

Feature/wallet preparetx #24

Conversation

akekeke commented Oct 24, 2018 • edited Loading

Jwata commented Oct 29, 2018

akekeke commented Nov 1, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akekeke commented Nov 2, 2018

Jwata left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akekeke commented Nov 5, 2018

Jwata left a comment

Choose a reason for hiding this comment

akekeke commented Oct 24, 2018 •

edited

Loading

akekeke commented Nov 1, 2018 •

edited

Loading