Commit Graph
19971 Commits
Author SHA1 Message Date
Jack Grigg a8e5ae92ba GetSerializeSize changes in Zcash-specific code 2018-04-16 07:38:38 -06:00
Pieter Wuille b8a6579366 Make GetSerializeSize a wrapper on top of CSizeComputer
Given that in default GetSerializeSize implementations created by
ADD_SERIALIZE_METHODS we're already using CSizeComputer(), get rid
of the specialized GetSerializeSize methods everywhere, and just use
CSizeComputer. This removes a lot of code which isn't actually used
anywhere.

For CCompactSize and CVarInt this actually removes a more efficient
size computing algorithm, which is brought back in a later commit.
2018-04-16 07:38:38 -06:00
Pieter Wuille 7f4acac433 Make nType and nVersion private and sometimes const
Make the various stream implementations' nType and nVersion private
and const (except in CDataStream where we really need a setter).
2018-04-16 07:38:37 -06:00
Pieter Wuille 1315591c85 Make streams' read and write return void
The stream implementations had two cascading layers (the upper one
with operator<< and operator>>, and a lower one with read and write).
The lower layer's functions are never cascaded (nor should they, as
they should only be used from the higher layer), so make them return
void instead.
2018-04-16 07:38:37 -06:00
Pieter Wuille 670a7686a6 Remove unused ReadVersion and WriteVersion
CDataStream and CAutoFile had a ReadVersion and WriteVersion method
that was never used. Remove them.
2018-04-16 07:38:37 -06:00
Cory Fields d1c9ef8606 serialization: teach serializers variadics
Also add a variadic CDataStream ctor for ease-of-use.
2018-04-16 07:38:37 -06:00
Pavel Janík ead36d85c7 [WIP] Remove unused statement in serialization
Zcash: Excludes changes to CBanEntry and CHDChain, which we don't have yet.
2018-04-16 07:38:37 -06:00
Matt Corallo c803fa1094 Add COMPACTSIZE wrapper similar to VARINT for serialization 2018-04-16 07:38:37 -06:00
Jonas Schnelli 6cbe2c482c add bip32 pubkey serialization
CExtPubKey should be serializable like CPubKey
2018-04-16 07:38:36 -06:00
Jack Grigg d2fb34fb7c Handle usage of prevector for CScript in Zcash-specific code 2018-04-16 07:38:36 -06:00
Pieter Wuille 29a8ade782 Prevector type 2018-04-16 07:38:36 -06:00
mruddy 690d38f0f8 Resolve issue bitcoin/bitcoin#3166.
These changes decode valid SIGHASH types on signatures in assembly (asm) representations of scriptSig scripts.
This squashed commit incorporates substantial helpful feedback from jtimon, laanwj, and sipa.
2018-04-16 07:38:36 -06:00
ca333 b8d174ef94 add Makefile 2018-04-16 15:18:45 +02:00
jl777 11077d9019 Disable auto rewind 2018-04-16 13:05:52 +03:00
jl777 7db1433a02 Disable auto rewind 2018-04-16 13:05:13 +03:00
jl777 8441f3f92f Disable auto rewind 2018-04-16 13:03:58 +03:00
jl777 b8dd52900a Disable auto rewind 2018-04-16 13:02:38 +03:00
jl777 68cf8a7e66 Fix 2018-04-16 12:21:46 +03:00
jl777 5215d24e81 Test another chance 2018-04-16 12:19:54 +03:00
jl777 54bf05383c if ( pindex != 0 ) 2018-04-16 11:31:34 +03:00
jl777 5db22eedcb if ( pindex != 0 ) 2018-04-16 11:31:05 +03:00
jl777 562deb53ca Test validity in mined block path 2018-04-16 11:31:05 +03:00
jl777 7a1b1fc4ff if ( pindex != 0 ) 2018-04-16 11:30:11 +03:00
jl777 7101b35b2d Deal with missing prev 2018-04-16 10:30:46 +03:00
jl777 2a32e55a31 Blockader 2018-04-16 10:25:20 +03:00
jl777 e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
Michael Toutonghi 1414fc0503 Move time lock check transaction to main.cpp 2018-04-16 00:05:56 -07:00
jl777 9226f69ef1 +prints 2018-04-16 09:55:38 +03:00
Michael Toutonghi edc5f727a8 build 2018-04-15 23:45:55 -07:00
Michael Toutonghi 992fdc3b9a Tighter locktime encoding + 5 byte support for 2108 issue 2018-04-15 23:36:32 -07:00
jl777 d3e5f6b7c3 return false; 2018-04-16 09:09:38 +03:00
jl777 78ca477a56 Set pindexPrev 2018-04-16 09:08:04 +03:00
jl777 cfefc9211b Miner fixes 2018-04-16 08:59:42 +03:00
jl777 b95368bf87 Mining fix 2018-04-16 08:56:27 +03:00
jl777 1d9d9b4f80 Devmerged 2018-04-16 08:41:04 +03:00
jl777 85db84a770 Merge branch 'devmerge' into jl777
# Conflicts:
#	src/komodo_globals.h
2018-04-16 08:40:08 +03:00
jl777 4d9b5edbcf Test 2018-04-16 08:35:52 +03:00
jl777 bdeeaa4978 Test 2018-04-16 08:29:21 +03:00
jl777 7b136bcd74 Merge branch 'dev' into devmerge
# Conflicts:
#	src/init.cpp
#	src/komodo_bitcoind.h
#	src/komodo_events.h
#	src/komodo_notary.h
#	src/komodo_structs.h
#	src/main.cpp
#	src/pow.cpp
#	src/rpcblockchain.cpp
2018-04-16 08:28:20 +03:00
jl777 9dd93da474 Test validity in mined block path 2018-04-16 08:23:29 +03:00
ca333 afa02103c9 update Makefile 2018-04-16 07:21:04 +02:00
jl777 6e0857cee1 Fix 2018-04-16 08:09:36 +03:00
jl777 64c8549164 Fix 2018-04-16 08:03:53 +03:00
jl777 e60ac1ca04 Fix 2018-04-16 08:02:27 +03:00
jl777 60eafafa52 Use CreateJoinSplit.cpp method for wallet-utility.cpp 2018-04-16 08:01:06 +03:00
jl777 e8972fab17 Fix 2018-04-16 08:00:07 +03:00
jl777 12b1a8af4c Extern MAX_MONEY 2018-04-16 07:56:48 +03:00
jl777 1abdb0de13 MAX_MONEY declare 2018-04-16 07:55:06 +03:00
ca333 5da8e41df2 fix Makefile 2018-04-16 06:48:44 +02:00
jl777 c01b993644 Test 2018-04-16 07:45:26 +03:00