Commit Graph
23279 Commits
Author SHA1 Message Date
David Dawes 274d8bd6eb Get additional extra space, back change out completely. 2018-06-10 00:01:57 -07:00
David Dawes f60687ca92 Undo makeRelase.sh changes. Hacked libs in directly. 2018-06-10 00:00:49 -07:00
David Dawes 19546c8f9a Merging latest, hacked dependencies so pull 'em from .travis.yml. 2018-06-09 23:52:31 -07:00
David Dawes 0995991e20 Hacking dependencies in. 2018-06-09 23:50:01 -07:00
David Dawes 116b8f69bd Hack in the dependencies. 2018-06-09 23:44:41 -07:00
David Dawes 957ebcc6d8 Merge branch 'master' into dave-dev 2018-06-09 23:38:31 -07:00
Asher Dawes 62a383830e Merge remote-tracking branch 'origin/dave-dev' into dave-dev 2018-06-09 22:33:31 -07:00
Asher Dawes ad565daadb Removed unnecessary -R paramater for chmod 2018-06-09 22:33:19 -07:00
David Dawes 33dae2bcb9 Try unrolling makeRelease.sh 2018-06-09 21:55:06 -07:00
Asher Dawes bcef0a1f0c travis clean up 2018-06-09 21:13:36 -07:00
Asher Dawes e1ec420f59 Travis clean up 2018-06-09 21:03:35 -07:00
Ariel Gabizon e1a3461cc2 Improve/Fix variable names
ZCProof was too general. pubKeyHash was actually the JoinSplit pubkey
itself.
2018-06-09 20:27:35 -07:00
David Dawes 9825b91b15 Trying to get makeRelease.sh run as part of the TravisCI build. 2018-06-09 19:42:36 -07:00
David Dawes 63e6b2b7bc Try getting Linux dependencies in. 2018-06-09 19:10:25 -07:00
David Dawes ac10faf3a4 Merge pull request #51 from VerusCoin/dave-dev
Put version 0.3.4-beta in README files
2018-06-09 17:11:38 -07:00
David Dawes ea97462a3f Merge branch 'dave-dev' of github.com:VerusCoin/VerusCoin into dave-dev 2018-06-09 15:54:17 -07:00
David Dawes d15890615c Add version to README. 2018-06-09 15:51:55 -07:00
David Dawes 3be84842e8 Add version to README. 2018-06-09 15:08:37 -07:00
David Dawes b7cbd15af4 Get version in README updated. 2018-06-09 14:41:50 -07:00
David Dawes 5800534abc Merge pull request #49 from VerusCoin/Asher-Dev
Adding upgrade batch file for verus-cli for Windows and updating the …
2018-06-09 13:41:29 -07:00
Asher Dawes b6b3255ce7 Fixed upgrade scripts for osx and linux 2018-06-09 13:07:50 -07:00
Homu 847df81f09 Auto merge of #3308 - ioptio:CoC-volunteer, r=daira
include note about volunteers in CoC
2018-06-09 03:17:32 -07:00
Daira Hopwood 3e45258e7c Update code_of_conduct.md
Wording tweak and line wrapping.
2018-06-09 11:16:43 +01:00
jl777 0db8b06a7b Merge branch 'dev' into jl777 2018-06-08 09:10:07 -11:00
jl777 ada22ead25 Merge pull request #693 from l0rb/patch-2
remove unused variable
2018-06-08 09:09:02 -11:00
l0rb 99d7ed2567 remove unused variable
minor code cleanup
2018-06-08 21:16:24 +02:00
jl777 7dc708d11c Merge pull request #692 from jl777/dev
bug fixes, consensus changes for PoS/PoW
2018-06-08 05:29:24 -11:00
jl777 f6cf227a30 Merge pull request #691 from jl777/jl777
reduce notary mining initial delay from 65 to 60 seconds
2018-06-08 05:18:55 -11:00
jl777 fa04bcf38c 65 seconds to 60 2018-06-08 05:17:25 -11:00
jl777 7714b7f143 Handle -disablewallet=1 2018-06-08 02:15:46 -11:00
jl777 f19b324032 Merge pull request #690 from jl777/jl777
prevent long delay between blocks
2018-06-07 21:15:05 -11:00
jl777 1659389801 Prevent very long gap in blocks 2018-06-07 21:01:41 -11:00
Homu de1bc2d389 Auto merge of #3321 - bitcartel:remove_librustcash_xor, r=str4d
Remove now redundant Rust call to librustzcash_xor.

Related to https://github.com/zcash/librustzcash/pull/17 which removes librustzcash_xor from library.
2018-06-07 20:37:07 -07:00
jl777 7cf23c9815 c++ 2018-06-07 09:18:48 -11:00
jl777 1eb7f6169f c++ 2018-06-07 09:17:08 -11:00
jl777 cf26692798 Syntax 2018-06-07 09:15:52 -11:00
jl777 d23c6a06e7 c++ 2018-06-07 09:15:13 -11:00
jl777 584b784c57 Fix 2018-06-07 09:13:38 -11:00
jl777 3001f999ec Syntax 2018-06-07 09:12:26 -11:00
jl777 acbc7a942a Segid to validate address 2018-06-07 06:31:20 -11:00
Jack Grigg 341a22ad90 Skip ELF-only sec-hard checks on non-ELF binaries 2018-06-07 18:49:15 +12:00
Simon 10a7d55a03 Remove now redundant Rust call to librustzcash_xor. 2018-06-06 23:24:21 -07:00
Jack Grigg 2802e321c1 Fix cached_witnesses_empty_chain test failure on MacOS
Assertion error format is different, so match only on the assertion.
2018-06-07 17:49:05 +12:00
Jack Grigg 5e38c24c1d Add Mach-O 64-bit detection to security-check.py
Fixes sec-hard test on MacOS CI worker. At some point we can extend this with
actual security hardening checks.
2018-06-07 17:49:01 +12:00
Jack Grigg bec3e62bc1 Implement encoding and decoding of Sapling keys and addresses 2018-06-07 17:28:50 +12:00
Jack Grigg c8511dfc07 Fix bech32::Encode() error handling
Previously, an input with invalid characters would result in out-of-bounds
reads, potentially exposing up to 224 bytes of memory following the location of
the CHARSET constant. This commit fixes the function to return an empty string,
which is what was originally documented as happening.
2018-06-07 17:19:44 +12:00
Pieter Wuille 6a2cc8ddc0 Simplify Base32 and Base64 conversions 2018-06-07 17:19:43 +12:00
Pieter Wuille ac70f76c5d Generalize ConvertBits 2018-06-07 17:19:34 +12:00
Jack Grigg 6b759fb092 ConvertBits() - convert from one power-of-2 number base to another.
Function extracted from upstream:
  PR bitcoin/bitcoin#11167
  Commit c091b99379b97cb314c9fa123beabdbc324cf7a4
2018-06-07 16:42:01 +12:00
Jack Grigg 7e45636707 chainparams: Add Sapling Bech32 HRPs 2018-06-07 16:41:59 +12:00