Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge armory/dev #124

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open

Merge armory/dev #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
fc3ec7d
Separate many Dlgs from qtdialogs.py
Dec 16, 2021
3c2c23d
import LOG functions in PyBtcWallet.py
goatpig Jan 27, 2022
0afbcc5
Fix missing imports, minor bugs
goatpig Jan 27, 2022
a1868dc
guard around SBD setup from empty strings
goatpig Jan 28, 2022
28bc489
remove obsolete leveldbwin folder
goatpig Jan 28, 2022
ad7589c
fix max button
goatpig Jan 28, 2022
87258e5
add missing definition in CppBridge.py
goatpig Jan 28, 2022
1863ed0
display datadir on DB startup
goatpig Jan 28, 2022
2f9e540
link to system protobuf
goatpig Jan 28, 2022
eedff09
add missing import
goatpig Jan 28, 2022
7192639
Merge remote-tracking branch 'origin/dev' into attic_qtdialogs
goatpig Feb 2, 2022
9fcdbd5
fix DlgDispTxInfo
goatpig Feb 2, 2022
f47bada
fix error verbose in when resolving config paths
goatpig Feb 2, 2022
7b4f153
fix licensing on refactor dlg files
goatpig Feb 2, 2022
cfa9089
implement botched Armory python hmac in cpp
goatpig Feb 16, 2022
d428b99
Refactor BackupCenter into its own file
goatpig Feb 16, 2022
87e9a54
Implement client side addSupportingTx for Signer object
goatpig Mar 13, 2022
9c29992
[WIP] dont handle p2sh preimage image in py unsigned tx ser/deser, us…
goatpig Mar 13, 2022
fd2d310
Fix some whitespace/style infractions
goatpig Mar 13, 2022
2042e5c
const a bunch of getters in BinaryData
goatpig Mar 13, 2022
5da73fc
increase size limits for supernode tables
goatpig Mar 13, 2022
b2fdfdc
Fix locktime ser/deser in Signer
goatpig Mar 13, 2022
799d7ec
USTX serialization type selector
goatpig Mar 30, 2022
a0d706b
fix filename hint in file save dialog
goatpig Mar 30, 2022
b8fc461
Update address type frame when selecting a wallet in Address Book dialog
goatpig Apr 5, 2022
2850e32
Fix missing imports in DlgNewAddress.py
goatpig Apr 5, 2022
6f99c2c
Fix isMine toggle in Wallet Details dialog
goatpig Apr 5, 2022
3498bd8
Deser sequence from legacy txsigcollect
goatpig Apr 5, 2022
a7d4bc7
P2SH-P2PK support for legacy USTX
goatpig May 24, 2022
c12846e
Fix wallet update labels, disable heavy benchmark in unit tests
goatpig May 25, 2022
0f8a813
cleaner coin2str algo
goatpig Jun 1, 2022
5671742
fix right click menu in main ledger
goatpig Jun 15, 2022
04e9b51
fix tx review dialog for unsigned transactions
goatpig Jun 15, 2022
63bd25a
fix coin control utxo listing
goatpig Sep 10, 2022
972949c
More readable block parsing options
goatpig Sep 11, 2022
5882a94
move blockchain database files to their own folder
goatpig Sep 11, 2022
a26b46e
use srcdir in makefile
goatpig Sep 11, 2022
776252f
[ARMORY-8] rework bridge api
goatpig Jan 31, 2023
48c1673
[ARMORY-8] python side
goatpig Apr 14, 2023
dc18b65
[ARMORY-8] fix spending, isolate python address code in armoryengine.…
goatpig May 5, 2023
b291975
[ARMORY-8] fix tests
goatpig May 16, 2023
0076e1c
[ARMORY-29] BIP39 support
goatpig May 19, 2023
1e16f07
[ARMORY-29]
goatpig May 28, 2023
2a94305
[ARMORY-29] BIP39 legacy English Trezor dictionnary support
goatpig May 29, 2023
07be576
[ARMORY-29] update wallet creation diagram
goatpig May 29, 2023
210cf43
Merge pull request #692 from goatpig/armory_29_bip39_support
goatpig May 29, 2023
c53de90
Merge pull request #691 from goatpig/armory_8_rework_bridge_api
goatpig May 29, 2023
40b6f92
merged Armory/dev
sergey-chernikov May 29, 2023
eeb41ad
merged with master
sergey-chernikov May 29, 2023
a8dcce5
file templates for regular wallets
sergey-chernikov May 31, 2023
f895833
ifdef'ed BUILD_PROTOBUF
sergey-chernikov Aug 29, 2024
641063b
superfluous include
sergey-chernikov Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.bak
*.swp
*.pyc
*~
Expand Down Expand Up @@ -48,6 +49,7 @@ stamp-h1
.dirstamp
1
.vs
client_cookie

Makefile
ArmoryDB
Expand Down Expand Up @@ -93,6 +95,7 @@ _CppBlockUtils.*
/cppForSwig/gtest/*.lmdb*
/cppForSwig/gtest/DB1kIterTest
/cppForSwig/gtest/SignerTests
/cppForSwig/gtest/fakehomedir/*

/cppForSwig/libbtc/bitcoin-spv

Expand Down Expand Up @@ -178,7 +181,7 @@ test-driver
/cppForSwig/protobuf/*.pb.*
/cppForSwig/x64/*.*
CppBridge
armoryengine/ClientProto_pb2.py
armoryengine/BridgeProto_pb2.py
cppForSwig/gtest/UtilsTests
cppForSwig/gtest/ZeroConfTests
c20p1305_cffi/c20p1305.c
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ copy-script:
cp cppForSwig/BIP150KeyManager ./BIP150KeyManager
cp cppForSwig/CppBridge ./CppBridge

# SWIG code and requirements.
# protobuf formas for python
if BUILD_CLIENT
protoc --python_out=armoryengine --proto_path=cppForSwig/protobuf cppForSwig/protobuf/ClientProto.proto
protoc --python_out=$(srcdir)/armoryengine --proto_path=$(srcdir)/cppForSwig/protobuf $(srcdir)/cppForSwig/protobuf/BridgeProto.proto
#TODO: build c20p1305 CFFI python lib
endif

Expand Down
27 changes: 0 additions & 27 deletions PublicKeys/goatpig-signing-key.asc
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions PublicKeys/laanwj-releases.asc
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ AC_CONFIG_MACRO_DIR([build-aux/m4])
m4_include([build-aux/m4/ax_check_compile_flag.m4])
m4_include([build-aux/m4/ax_cxx_compile_stdcxx.m4])

#check for c++11
AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory], [nodefault])
#check for c++17
AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])

# Make the compilation flags quiet unless V=1 is used.
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
Expand Down
Loading