Homu
|
80338c07e5
|
Auto merge of #3237 - str4d:std-array, r=str4d
Replace boost::array with std::array
|
2018-06-06 19:36:57 -07:00 |
|
Jack Grigg
|
4fb3d05ce9
|
Whitespace cleanup
|
2018-06-07 14:35:56 +12:00 |
|
jl777
|
15d17928f8
|
Allow asset chains to have more coinbase vouts
|
2018-06-06 07:06:40 -11:00 |
|
Homu
|
ffba08b0e0
|
Auto merge of #3318 - Eirik0:3298-fix-getnetworksolps-params, r=bitcartel
Fix parsing parameters in getnetworksolps
This fixes https://github.com/zcash/zcash/issues/3298. The parameters were not correctly being converted.
|
2018-06-06 10:00:21 -07:00 |
|
jl777
|
9be15e1c08
|
Fix coinbasevalue
|
2018-06-06 03:22:13 -11:00 |
|
jl777
|
b268860f81
|
Merge pull request #689 from jl777/jl777
-genjson option for komodo_port.c
much faster convergence for PoS/Pow ratio, but it will break any existing test chains
|
2018-06-06 03:01:17 -11:00 |
|
jl777
|
5f20a85d14
|
-genjson for komodo_port.c
|
2018-06-06 02:52:58 -11:00 |
|
Homu
|
d18212b1d6
|
Auto merge of #3299 - Eirik0:3248-update-getblocktemplate, r=str4d
Add hashFinalSaplingRoot to getblocktemplate
Closes #3248
|
2018-06-06 05:00:58 -07:00 |
|
Asher Dawes
|
efcdfc2775
|
Adding upgrade batch file for verus-cli for Windows and updating the README
|
2018-06-05 20:46:16 -07:00 |
|
Homu
|
b4874e9b09
|
Auto merge of #3269 - arcalinea:sapling_wallet_classes, r=ebfull
Add Sapling key classes to wallet
Leverages new librustzcash APIs added in https://github.com/zcash/librustzcash/pull/9
|
2018-06-05 15:46:24 -07:00 |
|
jl777
|
181e67c617
|
Increase conversion rate for PoW high diff, breaking change for existing testchains
|
2018-06-05 03:35:21 -11:00 |
|
Jack Grigg
|
c7e64754dc
|
Add MacOS support to no-dot-so test
|
2018-06-05 22:32:13 +12:00 |
|
Matthew King
|
12d3277171
|
Favour python over python2 as per PR #7723
|
2018-06-05 21:57:21 +12:00 |
|
Matthew King
|
d28d3d20de
|
Use portable #! in python scripts (/usr/bin/env)
|
2018-06-05 21:56:13 +12:00 |
|
Asher Dawes
|
dd59ac9359
|
Merge pull request #47 from VerusCoin/dave-dev
Clean up README a bit.
|
2018-06-04 22:25:10 -07:00 |
|
Asher Dawes
|
cfba6b21a1
|
Update README.md
Minor editing applied, looks good for now.
|
2018-06-04 22:24:42 -07:00 |
|
David Dawes
|
a4aac3d0b6
|
Clean up README a bit.
|
2018-06-04 22:12:45 -07:00 |
|
Eirik Ogilvie-Wigley
|
c61ed9acfb
|
Fix parsing parameters in getnetworksolps
|
2018-06-04 16:45:12 -06:00 |
|
Jay Graber
|
87c9994cb2
|
Make diversifier functions return option
|
2018-06-04 07:47:46 -07:00 |
|
Jay Graber
|
0da9aac63e
|
s/SaplingInViewingKey/SaplingIncomingViewingKey
|
2018-06-04 04:59:07 -07:00 |
|
David Dawes
|
1f02b18101
|
Merge pull request #45 from VerusCoin/dave-dev
Get update utility in, add notes on it to README.
|
2018-06-03 22:51:53 -07:00 |
|
David Dawes
|
e5d6a4a607
|
Get update utility in, add notes on it to README.
|
2018-06-03 22:19:35 -07:00 |
|
Asher Dawes
|
21fa3db72b
|
Merge pull request #44 from VerusCoin/dave-dev
Get Brewfile in
|
2018-06-03 21:20:17 -07:00 |
|
David Dawes
|
d249bcbdb3
|
Merge branch 'dev' into dave-dev
|
2018-06-03 21:11:06 -07:00 |
|
David Dawes
|
c7d92b5059
|
Add Brewfile for Mac and instructions.
|
2018-06-03 21:10:06 -07:00 |
|
David Dawes
|
86ec23e23b
|
Merge branch 'dev' of github.com:VerusCoin/VerusCoin into dave-dev
|
2018-06-03 20:59:56 -07:00 |
|
Asher Dawes
|
faf6e58e38
|
fixed fetch-params.bat url
|
2018-06-03 19:26:03 -07:00 |
|
David Dawes
|
8b54d943ff
|
Merge pull request #43 from VerusCoin/CI
CI updates and Mikes last fix, some README tweaks.
|
2018-06-03 18:13:45 -07:00 |
|
David Dawes
|
3451a2984a
|
Merge pull request #41 from verus-stuff/viewingkeys
Add missing ZCVIEWING_KEY to base58Prefixes
|
2018-06-03 18:12:21 -07:00 |
|
Asher Dawes
|
f2fae18deb
|
Update .gitignore
|
2018-06-03 17:40:30 -07:00 |
|
Asher Dawes
|
bec43cd23b
|
Adding fetch_params.bat and dependency for verus-cli for Windows
|
2018-06-03 17:35:24 -07:00 |
|
Asher Dawes
|
5efe81bddd
|
fixed typo
|
2018-06-03 12:21:49 -07:00 |
|
Asher Dawes
|
41148a356d
|
Storage auth only occurs on non pull requests.
adding brewfile to simplify mac development
|
2018-06-03 12:19:07 -07:00 |
|
Asher Dawes
|
9f66917629
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-06-03 12:15:25 -07:00 |
|
Asher Dawes
|
f948fb8b3e
|
Storage auth only occurs on non pull requests.
adding brewfile to simplify mac development
|
2018-06-03 12:15:11 -07:00 |
|
David Dawes
|
df2cbd02c6
|
Merge branch 'dev' into dave-dev
|
2018-06-03 09:49:46 -07:00 |
|
David Dawes
|
0080ae7c4d
|
Minor README mod to trigger a build.
|
2018-06-03 09:48:53 -07:00 |
|
jl777
|
ceb6321c7c
|
-print
|
2018-06-03 05:46:46 -11:00 |
|
Jonathan "Duke" Leto
|
b68a172c13
|
Add missing ZCVIEWING_KEY to base58Prefixes
|
2018-06-03 09:42:13 -07:00 |
|
Scott Sadler
|
7776d00b9a
|
fix MoMdepth in crosschain.cpp
|
2018-06-03 13:22:00 -03:00 |
|
Michael Toutonghi
|
cf98848cd4
|
return 0 for hash rate rather than stale value when not generating
|
2018-06-03 09:19:41 -07:00 |
|
jl777
|
93b144ac35
|
KV fix
|
2018-06-03 02:54:03 -11:00 |
|
jl777
|
b7aeaa2deb
|
Test
|
2018-06-03 00:58:51 -11:00 |
|
jl777
|
d630af57fb
|
Test
|
2018-06-03 00:55:40 -11:00 |
|
jl777
|
30999b9c12
|
Test
|
2018-06-03 00:52:55 -11:00 |
|
jl777
|
1c9b283d41
|
Merge branch 'dev' into jl777
|
2018-06-02 20:13:33 -11:00 |
|
jl777
|
5891a4215a
|
Merge pull request #688 from letolabs/viewingkeys
Fix the importing and exporting of viewing keys on mainnet + testnet
|
2018-06-02 20:13:18 -11:00 |
|
Michael Toutonghi
|
36d8ef6b7b
|
Fix "setgenerate true 0" to properly stake
|
2018-06-02 23:01:58 -07:00 |
|
Jonathan "Duke" Leto
|
97d48e2405
|
Add missing ZCVIEWING_KEY to base58Prefixes
|
2018-06-02 22:17:18 -07:00 |
|
Asher Dawes
|
f248d6a61c
|
travis clean up
|
2018-06-02 16:44:58 -07:00 |
|