Skip to content

Commit

Permalink
Fixed hardcore bug creating new wallets! Fwhew!
Browse files Browse the repository at this point in the history 
The update for "detectHighestUsedIndex()" was actually causing new
wallets to register with negative values, and then was not serializing
properly...  This is why I need more testers.  I almost
let this n00b-killing bug into the latest "stable" release!

Also updated copyrights on all files to include 2013
  • Loading branch information
@etotheipi
etotheipi committed Dec 23, 2012
1 parent 1e81beb commit 120a2e9
Show file tree
Hide file tree
Showing 26 changed files with 64 additions and 797 deletions.
14 changes: 3 additions & 11 deletions ArmoryQt.py
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
################################################################################
#
# Project: Armory (https://github.com/etotheipi/BitcoinArmory)
# Project: Armory
# Author: Alan Reiner
# Website: www.bitcoinarmory.com
# Orig Date: 20 November, 2011
#
# Descr: This is the client/GUI for Armory. Complete wallet management,
# encryption, offline private keys, watching-only wallets, and
# hopefully multi-signature transactions.
#
# The features of the underlying library (armoryengine.py) make
# this considerably simpler than it could've been, but my PyQt
# skills leave much to be desired.
#
#
################################################################################

import hashlib
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ def licenseText():
Armory -- Bitcoin Client Software
Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
Expand Down
762 changes: 26 additions & 736 deletions README
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion armorycolors.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
Expand Down
28 changes: 4 additions & 24 deletions armoryengine.py
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,21 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
################################################################################
#
# Project: Armory
# Author: Alan Reiner
# Website: www.bitcoinarmory.com
# Orig Date: 20 November, 2011
# Descr: This file serves as an engine for python-based Bitcoin software.
# I forked this from my own project -- PyBtcEngine -- because I
# I needed to start including/rewriting code to use CppBlockUtils
# but did not want to break the pure-python-ness of PyBtcEngine.
# If you are interested in in a pure-python set of bitcoin utils
# please go checkout the PyBtcEngine github project.
#
# Of course, the biggest advatage here is that you have access to
# the blockchain through BlockObj/BlockObjRef/BlockUtils, as found
# in the CppForSWIG directory. This is available in PyBtcEngine,
# but I had to split out the modules, and I didn't have a good way
# to maintain the pure-python module while also implementing all
# the great SWIG-imported C++ utilities I built.
#
# This module replaces the ECDSA operations, with faster ones
# implemented in C++ from Crypto++. This also enables the ability
# to use SecureBinaryData objects for moving around private keys,
# though I'm not entirely clear if python-based memory management
# is going to properly clean up after itself, even with a page-
# locked, self-destructing data container.
#
#
################################################################################


# Version Numbers
BTCARMORY_VERSION = (0, 86, 2, 0) # (Major, Minor, Minor++, even-more-minor)
BTCARMORY_VERSION = (0, 86, 3, 0) # (Major, Minor, Minor++, even-more-minor)
PYBTCWALLET_VERSION = (1, 35, 0, 0) # (Major, Minor, Minor++, even-more-minor)

ARMORY_DONATION_ADDR = '1ArmoryXcfq7TnCSuZa9fQjRYwJ4bkRKfv'
Expand Down Expand Up @@ -6823,7 +6803,7 @@ def detectHighestUsedIndex(self, writeResultToWallet=False, fullscan=False):
self.syncWithBlockchainLite(0)
self.doBlockchainSync = oldSync

highestIndex = self.highestUsedChainIndex
highestIndex = max(self.highestUsedChainIndex, 0)
for addr in self.getLinearAddrList(withAddrPool=True):
a160 = addr.getAddr160()
if len(self.getAddrTxLedger(a160)) > 0:
Expand Down
2 changes: 1 addition & 1 deletion armorymodels.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BinaryData.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BinaryData.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BlockObj.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BlockObj.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BlockUtils.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BlockUtils.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BlockUtilsTest.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BtcUtils.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BtcUtils.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/EncryptionUtils.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/EncryptionUtils.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/FileDataPtr.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/FileDataPtr.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/UniversalTimer.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/UniversalTimer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2012, Alan C. Reiner <[email protected]> //
// Copyright (C) 2011-2013, Alan C. Reiner <[email protected]> //
// Distributed under the GNU Affero General Public License (AGPL v3) //
// See LICENSE or http://www.gnu.org/licenses/agpl.html //
// //
Expand Down
6 changes: 5 additions & 1 deletion createTxFromAddrList.py → extras/createTxFromAddrList.py
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
################################################################################

import sys
sys.path.append('..')
sys.path.append('.')
from armoryengine import *
from getpass import getpass

Expand Down
2 changes: 1 addition & 1 deletion qtdefines.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
Expand Down
2 changes: 1 addition & 1 deletion qtdialogs.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
Expand Down
2 changes: 1 addition & 1 deletion unittest.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
#
# Copyright (C) 2011-2012, Alan C. Reiner <[email protected]>
# Copyright (C) 2011-2013, Alan C. Reiner <[email protected]>
# Distributed under the GNU Affero General Public License (AGPL v3)
# See LICENSE or http://www.gnu.org/licenses/agpl.html
#
Expand Down
9 changes: 5 additions & 4 deletions versions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


#-------------------------------------------------------------------------------
VERSION 0.86.2
VERSION 0.86.3

- Right-click Ledger Options
Added right-click menu to ledger for quick access to transaction
Expand All @@ -16,6 +16,10 @@ VERSION 0.86.2
Offline signing now displays appropriate warnings about what users
should verify for before signing and broadcasting.

- Added Comments to Coin Control (Expert Mode)
Abbreviated comments are now show in the coin control selection
window, with full comments availble via mouse-over text.

- Bugfix: Disappearing Addresses
Some startup operations were inadvertantly "rewinding" wallets with
unused addresses, causing those addresses to disappear from the
Expand All @@ -26,9 +30,6 @@ VERSION 0.86.2
All fields in the primary ledger are sortable. Some fields become
unsortable as a side-effect of ledger optimizations in v0.85.

- Added Comments to Coin Control (Expert Mode)
Abbreviated comments are now show in the coin control selection
window, with full comments availble via mouse-over text.


#-------------------------------------------------------------------------------
Expand Down

0 comments on commit 120a2e9

Please sign in to comment.