Skip to content

Commit

Permalink
bump version, update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
goatpig committed Dec 28, 2017
1 parent ada876b commit f57f5d8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion armoryengine/ArmoryUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
LEVELDB_HEADERS = 'leveldb_headers'

# Version Numbers
BTCARMORY_VERSION = (0, 96, 3, 99) # (Major, Minor, Bugfix, AutoIncrement)
BTCARMORY_VERSION = (0, 96, 3, 991) # (Major, Minor, Bugfix, AutoIncrement)
PYBTCWALLET_VERSION = (1, 35, 0, 0) # (Major, Minor, Bugfix, AutoIncrement)

# ARMORY_DONATION_ADDR = '1ArmoryXcfq7TnCSuZa9fQjRYwJ4bkRKfv'
Expand Down
9 changes: 9 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
v0.96.4
== Added ==
- Updated fee estimate query from node to improve estimateSmartFee call introduced in Bitcoin Core 0.15.
- The block confirmation target slider now spans from 2 to 100 blocks (previously 2 to 6).
- You can now pick between 2 fee estimation profiles: conservative and economical. Refer to the estimateRawFee section of
the Core 0.15 changelog for more information. A tooltip has been added to the GUI with a quick description.
- If your node does not support the estimateSmartFee method, the code will fallback to the previous estimateFee method.
- SegWit lockbox creation.
- BCH lockbox spending.
- Coin selection will now limit itself to change outputs when spending to external addresses you've spent to in the past.
Expand All @@ -12,6 +17,10 @@ v0.96.4
--listen-all: FCGI server will listen on :80 instead of 127.0.0.1:80

== Fixed ==
- Fixed creating offline transactions that mix P2SH and P2PKH UTXOs.
- Fixed importing wallets progress report and scan resolution in the GUI.
- Fixed SegWit sighash data serialization with scripts of length > 256 bytes.
- Fixed multiple RBF transaction bumping issues.
- Fixed ledger based fee bumping.
- Fixed RBF control dialog spawning.
- Fixed node sync progress bar.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
AC_INIT([BitcoinArmory], [0.96.3.99], [[email protected]])
AC_INIT([BitcoinArmory], [0.96.3.991], [[email protected]])

AM_INIT_AUTOMAKE([1.10 subdir-objects foreign -Wall -Werror])

Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/BitcoinP2P.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ void BitcoinP2P::connectLoop(void)
version.setVersionHeaderIPv4(70012, services, timestamp,
node_addr_, clientsocketaddr);

version.userAgent_ = "Armory:0.96.3.99";
version.userAgent_ = "Armory:0.96.3.991";
version.startHeight_ = -1;

sendMessage(move(version));
Expand Down

0 comments on commit f57f5d8

Please sign in to comment.