LBRYFoundation/lbcwallet
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcwallet.git synced 2025-08-23 17:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not serialize/deserialize armory unique ID.

Browse source 
Closes #70.
This commit is contained in:
Josh Rickmar 2014-02-03 15:11:17 -05:00
parent a0e94501cf
commit 03ffa0ccd8
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wallet/wallet.go
View file

@ -471,7 +471,6 @@ type comment []byte
type Wallet struct { type Wallet struct {
net btcwire.BitcoinNet net btcwire.BitcoinNet
flags walletFlags flags walletFlags
uniqID [6]byte
createDate int64 createDate int64
name [32]byte name [32]byte
desc [256]byte desc [256]byte
@ -548,8 +547,6 @@ func NewWallet(name, desc string, passphrase []byte, net btcwire.BitcoinNet,
// Create and fill wallet. // Create and fill wallet.
w := &Wallet{ w := &Wallet{
// TODO(jrick): not sure we will need uniqID, but would be good for
// compat with armory.
net: net, net: net,
flags: walletFlags{ flags: walletFlags{
useEncryption: true, useEncryption: true,
@ -627,7 +624,7 @@ func (w *Wallet) ReadFrom(r io.Reader) (n int64, err error) {
&vers, &vers,
&w.net, &w.net,
&w.flags, &w.flags,
&w.uniqID, make([]byte, 6), // Bytes for Armory unique ID
&w.createDate, &w.createDate,
&w.name, &w.name,
&w.desc, &w.desc,
@ -753,7 +750,7 @@ func (w *Wallet) WriteTo(wtr io.Writer) (n int64, err error) {
&VersCurrent, &VersCurrent,
&w.net, &w.net,
&w.flags, &w.flags,
&w.uniqID, make([]byte, 6), // Bytes for Armory unique ID
&w.createDate, &w.createDate,
&w.name, &w.name,
&w.desc, &w.desc,
@ -1344,7 +1341,6 @@ func (w *Wallet) ExportWatchingWallet() (*Wallet, error) {
useEncryption: false, useEncryption: false,
watchingOnly: true, watchingOnly: true,
}, },
uniqID: w.uniqID,
name: w.name, name: w.name,
desc: w.desc, desc: w.desc,
createDate: w.createDate, createDate: w.createDate,