Commit Graph

14554 Commits

Author SHA1 Message Date
jl777
3d35aa5b13 test 2016-10-03 11:32:30 -03:00
jl777
acda55b4db Merge pull request #29 from jl777/dPoW
test
2016-10-03 10:28:14 -03:00
jl777
76c0be99bc test 2016-10-03 10:27:44 -03:00
jl777
00e31841b7 Merge pull request #28 from jl777/dPoW
test
2016-10-03 10:23:18 -03:00
jl777
a2a3945ef5 test 2016-10-03 10:22:55 -03:00
jl777
b1573b2e29 Merge pull request #27 from jl777/dPoW
test
2016-10-03 10:20:51 -03:00
jl777
7bfc207ada test 2016-10-03 10:20:27 -03:00
jl777
842da62530 Merge pull request #26 from jl777/dPoW
-pubkey fix
2016-10-03 10:11:28 -03:00
jl777
c939721cee -pubkey fix 2016-10-03 10:11:03 -03:00
jl777
ebd333e8e5 Merge pull request #25 from jl777/dPoW
test
2016-10-03 09:46:17 -03:00
jl777
5645d1115a test 2016-10-03 09:45:49 -03:00
jl777
eda1490c25 Merge pull request #24 from jl777/dPoW
test
2016-10-03 09:02:55 -03:00
jl777
fa9f227180 test 2016-10-03 09:02:29 -03:00
jl777
e73c7fe0c1 Merge pull request #23 from jl777/dPoW
printout
2016-10-03 08:51:43 -03:00
jl777
de8d24ddc7 printout 2016-10-03 08:51:13 -03:00
jl777
f8ed54aafb Merge pull request #22 from jl777/dPoW
test
2016-10-03 08:49:30 -03:00
jl777
ee1db7784c test 2016-10-03 08:49:02 -03:00
jl777
4ba11fb1af Merge pull request #21 from jl777/dPoW
test
2016-10-03 08:47:29 -03:00
jl777
86ea73092f test 2016-10-03 08:47:01 -03:00
jl777
1599111fb2 Merge pull request #20 from jl777/dPoW
test
2016-10-03 08:37:40 -03:00
jl777
1cf67c7040 test 2016-10-03 08:37:05 -03:00
jl777
2bc0bb9875 Merge pull request #19 from jl777/dPoW
fix args
2016-10-03 08:31:15 -03:00
jl777
c95fd5e040 fix args 2016-10-03 08:30:09 -03:00
jl777
43d59118f4 Merge pull request #18 from jl777/dPoW
DPoW
2016-10-03 08:18:52 -03:00
jl777
998397aa2c fixed pubkey for notary mining 2016-10-03 08:16:53 -03:00
zkbot
fa632c1c91 Auto merge of #1468 - str4d:1138-change-versioning-scheme, r=str4d
Change versioning scheme

Closes #1138
2016-10-02 19:29:38 -04:00
str4d
6c92100607 Merge pull request #4 from daira/1138-change-versioning-scheme
Repair FormatSubVersion tests. refs #1138
2016-10-02 16:28:36 -07:00
Daira Hopwood
0fafbd5d0a Repair FormatSubVersion tests. refs #1138
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-10-02 16:44:56 +01:00
jl777
6c6a735e59 Merge pull request #17 from pondsea/master
Update README.md
2016-10-02 07:35:03 -03:00
pondsea
6c4dfa1c60 Update README.md 2016-10-02 21:23:45 +11:00
jl777
5fa40e4a0e Merge pull request #15 from pondsea/master
Update README.md
2016-10-02 07:18:13 -03:00
pondsea
8aeb7db1c5 Update README.md 2016-10-02 21:15:13 +11:00
zkbot
0df0ce05f0 Auto merge of #1467 - ageis:wget-cert-verify, r=str4d
Verify TLS certificates w/ wget in fetch-params.sh

Per NCC-2016-017, wget was being run with `--no-check-certificate`, which means that the connection can be man-in-the-middled, even if we are verifying the integrity of the parameters later via hash sums.
The rationale cited in the Bash comments does not stand up to scrutiny. There's really no persuasive reason not to verify certificates.

Fixes #1346.
2016-10-02 03:01:14 -04:00
Jack Grigg
5428c6ca34 Formatting fix 2016-10-02 19:15:01 +13:00
zkbot
d9da9d69ff Auto merge of #1398 - bitcartel:master_fr48, r=bitcartel
Add multiple founders' reward addresses

./zcash-gtest --gtest_filter="founders_reward_test.*"

Closes #1405.
2016-10-01 17:12:33 -04:00
jl777
80e7004134 Merge pull request #14 from VanBreuk/master
Updated dependencies and reference peers
2016-10-01 15:51:12 -03:00
VanBreuk
aae8f28155 Updated dependencies and reference peers 2016-10-01 20:48:24 +02:00
Simon
4d11e5d2b9 Update mainnet addresses used for testing to have the correct number 2016-10-01 07:19:24 -07:00
Jack Grigg
1fa852f7a0 Update release process with version schema 2016-10-02 00:27:50 +13:00
Jack Grigg
899d8cf5f3 Use CLIENT_VERSION_BUILD to represent -beta and -rc in client version 2016-10-02 00:20:02 +13:00
Jack Grigg
63bc8c9a17 Downgrade bdb to 5.3.28
bdb 6.X was released under the AGPL, which is incompatible with MIT-licensed
software (the result must be licensed under AGPL). bdb 5.X uses the same license
as bdb 4.8, and thus retains the same compatibility as in upstream Bitcoin.

Thanks to Luke-Jr for raising this issue.
2016-10-01 23:02:32 +13:00
Simon
2d6e97ecc5 Add field fMinerTestModeForFoundersRewardScript to chainparams 2016-09-30 18:31:51 -07:00
Simon
02acbfc262 Add mainnet 2-of-3 multisig addresses for testing. 2016-09-30 18:29:10 -07:00
Simon
6c54e9fc0b Update testnet founders reward addresses 2016-09-30 14:42:47 -07:00
Simon
88fd810150 Update founders reward test to output path of temporary wallet.dat file which contains keys which can be used for testing founders reward addresses. 2016-09-30 14:42:47 -07:00
Simon
b7d072069e Update comment per review 2016-09-30 14:42:47 -07:00
Simon
22dadb35ec Refactor and fix per review 2016-09-30 14:42:47 -07:00
Simon
1a21a25e62 Refactor to add test to verify number of rewards each mainnet address will receive 2016-09-30 14:42:47 -07:00
Simon
241867b115 Founders reward: Refactor test and formatting per review. 2016-09-30 14:42:47 -07:00
Simon
3b30d8361a Founders reward: changed index computation, added new test and some refactoring. 2016-09-30 14:42:47 -07:00