jl777
30ae756003
Test
2018-09-21 20:50:42 -11:00
jl777
5aad163700
Test
2018-09-21 20:48:11 -11:00
jl777
7108bc79f5
Test
2018-09-21 20:44:55 -11:00
jl777
bf8e9b4d66
Test
2018-09-21 20:36:22 -11:00
jl777
4eafa6062d
Test
2018-09-21 20:34:54 -11:00
jl777
a4602c8956
Test
2018-09-21 20:33:54 -11:00
jl777
35506c9ae6
Test
2018-09-21 20:31:19 -11:00
jl777
c46c04b331
Test
2018-09-21 20:29:58 -11:00
jl777
2dd23a2617
Test
2018-09-21 20:29:18 -11:00
jl777
9a59ff3ff1
Test
2018-09-21 20:25:10 -11:00
Homu
fbbbb1cc82
Auto merge of #3537 - str4d:enable-sapling-features, r=bitcartel
...
Enable Sapling features on mainnet
Reverts the last commit from #3458 .
2018-09-21 17:32:56 -07:00
Jack Grigg
34e222c18e
Revert "Disable Sapling features on mainnet"
...
This reverts commit 554e00e8f9
2018-09-21 23:43:31 +01:00
Simon
f1cb49ac86
For #3533 . Replace asserts with JSON errors.
...
This helps prevent users from triggering an assert if they pass in
Sapling addresses to RPC calls: z_mergetoaddress, z_importviewingkey
and z_exportviewingkey.
2018-09-21 15:01:45 -07:00
Simon
18f8abb62d
Closes #3534 . Do not use APPROX_RELEASE_HEIGHT to get consensus branch
...
id when in regtest mode.
Co-authored-by: Larry Ruane <larryruane@gmail.com >
2018-09-21 11:10:15 -07:00
jl777
a4f7b6910f
Fix silly bug
2018-09-21 07:08:47 -11:00
jl777
8267beff37
+print
2018-09-21 06:56:43 -11:00
jl777
88b5d9e46a
Fix token convert
2018-09-21 03:34:39 -11:00
blackjok3r
d35a888245
)
2018-09-21 17:23:26 +08:00
blackjok3r
c2ec9c5468
syntax
2018-09-21 17:21:30 +08:00
blackjok3r
0233e249cf
change to int
2018-09-21 17:19:16 +08:00
blackjok3r
90f50a9ee7
add is_staked function
2018-09-21 17:15:21 +08:00
blackjok3r
c85b1ace10
hmmmm
2018-09-21 17:02:22 +08:00
blackjok3r
263c24b266
maybe
2018-09-21 16:56:34 +08:00
blackjok3r
5f2b706625
meh
2018-09-21 16:09:51 +08:00
blackjok3r
3b210ee00c
WTFTWTFEWIDlknPI
2018-09-21 15:57:30 +08:00
blackjok3r
7384746b72
WTFWTFW
2018-09-21 15:48:26 +08:00
blackjok3r
77ee7feec8
about to blow it up
2018-09-21 15:43:16 +08:00
blackjok3r
c83285ffe2
add include file to makefile ... Please work?!
2018-09-21 15:24:53 +08:00
blackjok3r
bb33491657
thanks mike
2018-09-21 15:11:36 +08:00
blackjok3r
3539848b60
typo
2018-09-21 13:41:40 +08:00
blackjok3r
9a469cda6f
try hardcode of array length
2018-09-21 13:37:26 +08:00
blackjok3r
1183a043b2
try again
2018-09-21 13:28:25 +08:00
blackjok3r
14acb852d5
try again
2018-09-21 13:23:00 +08:00
blackjok3r
158d7befbc
WTF!??!?
2018-09-21 13:11:12 +08:00
blackjok3r
bb7815b05b
that didnt work
2018-09-21 13:09:53 +08:00
blackjok3r
3dcbdcb85c
try something else
2018-09-21 13:08:13 +08:00
blackjok3r
9f1e5ad6c0
runnign around in circles here, little sense!
2018-09-21 12:41:10 +08:00
blackjok3r
95918c6402
fix dumbness
2018-09-21 12:29:39 +08:00
blackjok3r
feed6b75c9
Merge branch 'blackjok3r' of https://github.com/StakedChain/komodo into blackjok3r
...
not sure what this si LOL
2018-09-21 12:24:35 +08:00
blackjok3rtt
a3c528d14e
Merge branch 'blackjok3r'
...
merg matser
2018-09-21 04:21:32 +00:00
blackjok3rtt
d5e3425710
Merge branch 'master' into HFtest
...
fix verison.h
2018-09-21 03:54:50 +00:00
blackjok3r
6f3af3ff83
Change minsigs to 4, remove supply hack.
2018-09-21 11:46:25 +08:00
blackjok3r
b7a3348ed1
change some stuff
2018-09-21 11:43:32 +08:00
blackjok3r
24f0f84417
try this
2018-09-21 11:20:09 +08:00
Asher Dawes
5ce49ee344
Fixing Windows compilation.
...
Removing __cpuid definition when compiling for Windows to avoid conflicting definitions of __cpuid provided by gcc and intrin.h .
Updating GitLab yml to deploy to Slack during the build step for manual testing.
2018-09-20 16:08:25 -07:00
miketout
09dfacd0eb
Don't reject based on erroneous version
2018-09-20 14:07:16 -07:00
miketout
644c7445ec
Latest Zcash updates
2018-09-20 13:32:57 -07:00
blackjok3r
41c25e89db
?
2018-09-21 03:16:35 +08:00
blackjok3r
0f02546428
?
2018-09-21 03:12:24 +08:00
blackjok3r
75a86d88a2
?
2018-09-21 03:10:28 +08:00
