Commit Graph

9746 Commits

Author SHA1 Message Date
jl777
f5dfad85bd test 2016-10-18 12:48:18 -03:00
jl777
b501ded2ba test 2016-10-18 12:46:23 -03:00
jl777
504b72a3ee test 2016-10-18 12:41:44 -03:00
jl777
058e057f9a test 2016-10-18 12:40:37 -03:00
jl777
c79c1c1921 test 2016-10-18 12:38:40 -03:00
jl777
aa8b56eaca test 2016-10-18 12:32:02 -03:00
jl777
d3529dd1bc test 2016-10-18 12:08:10 -03:00
jl777
880b293115 test 2016-10-18 12:04:54 -03:00
jl777
c9b8b8b04b test 2016-10-18 12:02:37 -03:00
jl777
a538070e40 test 2016-10-18 11:13:35 -03:00
jl777
957ef1239c test 2016-10-18 11:11:47 -03:00
jl777
0570045c87 test 2016-10-18 11:08:37 -03:00
jl777
fffef49eca test 2016-10-18 10:55:43 -03:00
jl777
1d095ca0f7 test 2016-10-17 17:01:17 -03:00
jl777
3bb1d82c03 test 2016-10-17 16:59:05 -03:00
jl777
2f6bcf659c test 2016-10-17 16:50:23 -03:00
jl777
a18c8eaa77 test 2016-10-17 16:32:52 -03:00
jl777
6fc7179140 test 2016-10-17 16:27:56 -03:00
jl777
1cf07d4396 test 2016-10-17 16:26:06 -03:00
jl777
49365ac5d2 test 2016-10-17 16:24:37 -03:00
jl777
883df96939 test 2016-10-17 16:23:48 -03:00
jl777
b801c3b706 test 2016-10-17 16:19:05 -03:00
jl777
126c92b60a test 2016-10-17 16:09:06 -03:00
jl777
ab714a45d0 test 2016-10-17 16:05:20 -03:00
jl777
5b7ce70855 test 2016-10-17 16:02:34 -03:00
jl777
3a672e7b11 Merge remote-tracking branch 'zcash/master' into dPoW 2016-10-17 15:28:00 -03:00
jl777
9e211e057f test 2016-10-17 15:05:14 -03:00
jl777
f920ed0067 test 2016-10-17 15:04:04 -03:00
jl777
293de087a7 test 2016-10-17 15:00:02 -03:00
jl777
26f001fda2 test 2016-10-17 14:58:50 -03:00
jl777
368b31f287 test 2016-10-17 14:54:42 -03:00
jl777
07a7605985 test 2016-10-17 14:53:48 -03:00
jl777
edea78beeb test 2016-10-17 14:52:43 -03:00
jl777
9e71587474 test 2016-10-17 14:35:48 -03:00
jl777
d27e196e8d test 2016-10-17 14:27:27 -03:00
jl777
5f089b00f2 test 2016-10-17 13:47:57 -03:00
jl777
d6b4ea6610 test 2016-10-17 13:27:06 -03:00
jl777
f2d60864a9 notarized checkpoint 2016-10-17 13:18:45 -03:00
Jack Grigg
6a7acc29a1 Set CBlockIndex.hashAnchor correctly in ConnectBlock 2016-10-17 11:09:24 -05:00
Jack Grigg
85457ddec1 Add clear error message for upgrading users 2016-10-17 09:55:02 -05:00
Jack Grigg
b6961fc112 Increment witnesses for new transactions on rescan
Closes #1400
2016-10-17 09:55:02 -05:00
zkbot
fd23341f1e Auto merge of #1547 - daira:1378-witness-cache-assertion-failure.1, r=bitcartel
Add more precise assertions in IncrementNoteWitnesses

Part of #1378
2016-10-17 03:00:19 -04:00
zkbot
98224d76f5 Auto merge of #1521 - zcash:gitian, r=bitcartel
Update Linux Gitian descriptor for building Zcash

Changes required to use the Gitian builder at https://github.com/zcash/zcash-gitian

Closes #540.
2016-10-17 01:55:03 -04:00
zkbot
4ee9d712b5 Auto merge of #1541 - str4d:upstream-gitian-updates, r=bitcartel
Upstream gitian updates

This PR pulls in all gitian-related PRs that have been merged upstream since 0.11.2. The only ones I left out were documentation-only PRs, because we removed `doc/gitian-building.md` at some point. Here are the commits applied here, in the order shown in `git log` (ie. last to first):

- bitcoin/bitcoin#7283
  - fa42a67
  - fa58c76
- bitcoin/bitcoin#8175
  - 74c1347
- bitcoin/bitcoin#8167
  - 7e7eb27
  - ad38204
  - b676f38
- bitcoin/bitcoin#7776
  - f063863
- bitcoin/bitcoin#7424
  - a81c87f ~ we already partly applied
  - a8ce872
  - f3d3eaf ~ we already partly applied
  - 475813b
  - ~~cd27bf5~~ X we already applied
- bitcoin/bitcoin#7060
  - 3b468a0 ~ we removed doc/gitian-building.md
  - ~~99fda26~~ X we removed doc/gitian-building.md
- bitcoin/bitcoin#7251
  - fa09562
- bitcoin/bitcoin#6900
  - ~~2cecb24~~ X we removed doc/gitian-building.md
  - 957c0fd
  - 2e31d74
  - ~~0b416c6~~ X we removed QT
  - 9f251b7
- bitcoin/bitcoin#6854
  - 579b863 ~ we already partly applied

Part of #540
2016-10-17 01:17:01 -04:00
zkbot
e8d28a0acc Auto merge of #1448 - ageis:debian-package, r=bitcartel
Initial packaging for Debian

This adds some source files, a script and skeleton for building a Debian package that installs the zcash daemon and CLI tool.

To test it:

Check out my branch.
Build Zcash binaries: `./zcutil/build.sh`
Build the package: `./zcutil/build-debian-package.sh`
You now have a .deb in the source root folder, so install it: `sudo dpkg -i zcash-1.0.0-rc1-amd64.deb`
Now you can run `zcashd`, `zcash-cli`, and `zcash-fetch-params` from `$PATH`.

This pull request will need further refinement and review, so let's leave it open for a while.
2016-10-17 00:22:50 -04:00
Daira Hopwood
95e32d88b0 Add another assertion about the witness cache.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-17 05:09:27 +01:00
Daira Hopwood
8e41408aa7 Add another assertion to narrow down where the bug occurs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-17 05:09:27 +01:00
Daira Hopwood
8a7d37befd Move the increment of nWitnessCacheSize to make the later assertions correct.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-17 05:09:27 +01:00
Jack Grigg
83d7b5b67b Add more asserts to track down the bug 2016-10-17 05:09:27 +01:00
Kevin Gallagher
b53b5a63e1 Adds . to blank lines in Google license 2016-10-16 20:53:06 -07:00