Luke Dashjr
47a494e113
Merge branch 'master' into segwit
2016-12-01 23:31:11 +00:00
Luke Dashjr
5e409f22fb
Merge branch '0.5.x'
2016-12-01 23:30:20 +00:00
Luke Dashjr
835ed46634
Merge branch '0.4.x' into 0.5.x
2016-12-01 23:30:13 +00:00
Luke Dashjr
61deba379e
Avoid memcpy with potentially NULL pointer if scriptsz is zero
2016-12-01 23:30:06 +00:00
Luke Dashjr
bea591911d
Merge branch 'master' into segwit
2016-11-22 10:52:02 +00:00
Luke Dashjr
07ce01f57a
test: Check blkmk_init_generation
2016-08-13 08:35:37 +00:00
Luke Dashjr
6c56da6a04
Bugfix: blkmk_append_coinbase_safe2: Check for unexpected larger values before subtracting (in sigop checks)
2016-08-13 08:26:46 +00:00
Luke Dashjr
f333f3c662
Merge branch '0.5.x'
2016-08-13 08:26:34 +00:00
Luke Dashjr
ea800f8be1
Merge branch '0.4.x' into 0.5.x
2016-08-13 08:26:02 +00:00
Luke Dashjr
9cfdca809c
Bugfix: blkmk_append_coinbase_safe2: Check for unexpected larger values before subtracting
2016-08-13 08:24:59 +00:00
Luke Dashjr
963262af08
_blkmk_calculate_witness_mrklroot: Allocate heap space for hashes, rather than use the (potentially too small) stack
2016-08-12 01:20:46 +00:00
Luke Dashjr
147e86b466
Merge branch 'master' into segwit
2016-08-12 01:06:33 +00:00
Luke Dashjr
a9b3541a60
Merge branch '0.5.x'
2016-08-12 01:04:23 +00:00
Luke Dashjr
3d482768d6
Merge branch '0.4.x' into 0.5.x
2016-08-12 01:03:36 +00:00
Luke Dashjr
37cd25dfc1
Merge commit '5a88bc5' into 0.4.x
2016-08-12 01:03:06 +00:00
Luke Dashjr
5a88bc541a
Allocate heap space for hashes, rather than use the (potentially too small) stack
2016-08-12 01:02:08 +00:00
Luke Dashjr
896dc34d47
Merge branch 'bugfix_sizelimit' into 0.5.x
2016-08-11 23:37:14 +00:00
Luke Dashjr
981b1dc4fe
Bugfix: Include block header and transaction count in sizelimit checks
2016-08-11 23:37:00 +00:00
Luke Dashjr
aa74130c59
Bugfix: Handle unknown transaction weight by either calculating it (generation only) or ignoring the weightlimit
2016-08-11 22:10:53 +00:00
Luke Dashjr
aaaa53e7d9
Merge branch '0.5.x'
2016-08-11 07:43:42 +00:00
Luke Dashjr
b2ff42e8b7
Merge branch '0.4.x' into 0.5.x
2016-08-11 07:43:37 +00:00
Luke Dashjr
128458fbd0
Merge branch 'bugfix_sizelimit' into 0.5.x
2016-08-11 07:39:45 +00:00
Luke Dashjr
ce5125dc90
Merge commit '15745d4' into 0.4.x
2016-08-11 07:38:58 +00:00
Luke Dashjr
328300edbe
Merge commit '4a01674' into 0.4.x
2016-08-11 07:38:45 +00:00
Luke Dashjr
1783777646
Merge commit 'ebd42b2' into 0.4.x
2016-08-11 07:38:31 +00:00
Luke Dashjr
7b1113110a
Bugfix: Correct return type for blkmk_append_coinbase_safe2 hitting sizelimit
2016-08-11 07:37:57 +00:00
Luke Dashjr
15745d4a5f
Bugfix: Ensure coinbase is always at least 4 bytes long
2016-08-11 07:34:34 +00:00
Luke Dashjr
4a01674cd0
Bugfix: blkmk_get_mdata must fail if we cannot append the coinbase
2016-08-11 07:29:31 +00:00
Luke Dashjr
ebd42b2461
Bugfix: Correct blkmk_work_left for single-work templates that have been used
2016-08-11 07:29:01 +00:00
Luke Dashjr
e1a1b1bd07
assemble_submission: Avoid magic number constants for sizes
2016-07-26 23:56:13 +00:00
Luke Dashjr
3ff3604939
Add "segwit" to supported rule list
2016-07-26 23:54:37 +00:00
Luke Dashjr
86c6f760bf
Bugfix: assemble_submission: Enlarge block buffer for witness commitment
2016-07-26 23:54:14 +00:00
Luke Dashjr
7e10567263
Merge branch 'master' into segwit
2016-07-26 23:51:47 +00:00
Luke Dashjr
c524b0160d
Merge branch '0.5.x'
2016-07-26 23:51:21 +00:00
Luke Dashjr
87ccb59726
Merge branch 'bip9' into 0.5.x
2016-07-26 23:50:26 +00:00
Luke Dashjr
1799d18d55
Merge commit '6002cb9' into 0.5.x (removing a line)
2016-07-26 23:49:42 +00:00
Luke Dashjr
6002cb96a0
assemble_submission: Include extranoncesz in buffer allocation
...
Missing this would result in a buffer overrun, except the varint is allocated 9 bytes, extranonce is rarely more than 4 or 5, and the varint itself can't realistically be more than 3 today
2016-07-26 23:44:17 +00:00
Luke Dashjr
28a2bb7f6b
Add segwit commitment at the end, rather than the start of the output list
2016-07-26 17:20:55 +00:00
Luke Dashjr
5307b027f6
Implement weightlimit
2016-07-26 04:36:22 +00:00
Luke Dashjr
b5c6d97be7
Use new sigop counting (ie, quadrupled) when "segwit" in rules list
2016-07-26 04:24:46 +00:00
Luke Dashjr
1250b472f0
Merge branch 'master' into segwit
2016-07-26 04:23:36 +00:00
Luke Dashjr
871871ddd5
Merge branch 'sigoplimit'
2016-07-26 04:22:24 +00:00
Luke Dashjr
80c85d212a
When possible, check sigoplimit before appending to the coinbase
2016-07-26 04:07:09 +00:00
Luke Dashjr
5ee6256cb4
Merge branch 'master' into segwit
2016-07-26 03:23:53 +00:00
Luke Dashjr
72d0d641b4
Merge branch 'bip9'
2016-07-26 03:21:43 +00:00
Luke Dashjr
651323c7c1
Merge branch 'master' into segwit
2016-07-26 03:13:43 +00:00
Luke Dashjr
df9c3e9303
blkmk_init_generation*: If possible, check we are not overflowing sigoplimit
2016-07-26 03:11:46 +00:00
Luke Dashjr
e37ae9022b
Implement blkmk_count_sigops
2016-07-26 03:11:18 +00:00
Luke Dashjr
1cf20a8348
Merge integer unpacking code
2016-07-26 02:51:12 +00:00
Luke Dashjr
1a3cdfd792
Merge branch 'master' into segwit
2016-07-26 02:32:36 +00:00
