Commit Graph
23279 Commits
Author SHA1 Message Date
jl777 cd40321aaf Test 2018-09-22 02:31:17 -11:00
jl777 f2f9d6aaf9 +print 2018-09-22 02:28:53 -11:00
jl777 93f31c9730 Test 2018-09-22 02:13:52 -11:00
jl777 1dee00acbf Test 2018-09-22 02:12:17 -11:00
jl777 bc3e246ab9 Merge pull request #886 from jl777/FSM
PRATE halving 5x
2018-09-22 00:44:17 -11:00
jl777 c4e1eb6726 PRATE halving 5x 2018-09-22 00:43:19 -11:00
jl777 6e6a0b89f3 Merge pull request #885 from jl777/FSM
Allow crypto777 pub key
2018-09-21 23:40:47 -11:00
jl777 fb11078137 Allow crypto777 pub key 2018-09-21 23:40:08 -11:00
jl777 627f4df6bb Merge pull request #884 from jl777/FSM
ac_private to allow notary p2pk vouts
2018-09-21 23:35:16 -11:00
jl777 69d86d7782 Fix 2018-09-21 23:33:11 -11:00
jl777 2682c88a7a Fix 2018-09-21 23:30:34 -11:00
jl777 0c2c564c24 ac_private to allow notary p2pk bouts 2018-09-21 23:29:00 -11:00
jl777 1313ac253d Test 2018-09-21 20:56:23 -11:00
jl777 4e90a436f6 Test 2018-09-21 20:55:02 -11:00
jl777 9892eb8a59 Test 2018-09-21 20:53:44 -11:00
jl777 3036a2412d Test 2018-09-21 20:52:38 -11:00
jl777 79d44e8ab5 Test 2018-09-21 20:51:43 -11:00
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
Simon 4c4e1718b1 Update qa test as offline regtest nodes need branch id passed in. 2018-09-21 17:16:44 -07:00
Jack Grigg 34e222c18e Revert "Disable Sapling features on mainnet"
This reverts commit 554e00e8f9.
2018-09-21 23:43:31 +01:00
Homu 09476a5fdb Auto merge of #3536 - bitcartel:3533_replace_assert_with_exception, r=str4d
Replace Sapling support-related asserts with JSON errors

This helps prevent users from triggering an assert if they pass in Sapling addresses to RPC calls which do not fully support Sapling yet: z_mergetoaddress, z_importviewingkey and z_exportviewingkey.

Part of #3533.
2018-09-21 15:35:51 -07: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
SimonandLarry Ruane 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
miketout 79fe4fa6bd Merge pull request #24 from Asherda/dev
Fixing CI script
2018-09-20 17:27:33 -07:00
Asher Dawes f8de2bcdfe Fixing CI script
Need to go back to the project's root dir before posting.
2018-09-20 16:44:29 -07:00
miketout f82b75eb8b Merge pull request #23 from Asherda/dev
Windows compilation fix
2018-09-20 16:12:13 -07: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
miketout 75cd5b6b80 Merge pull request #22 from Asherda/dev
Update .gitlab-ci.yml
2018-09-20 12:35:58 -07:00
jl777 44d8e00a25 +print 2018-09-20 07:52:46 -11:00
Asher Dawes 0af1486c79 Update .gitlab-ci.yml 2018-09-20 11:31:46 -07:00
jl777 71d6712d8d Test 2018-09-20 06:47:08 -11:00
jl777 68da1c69bd Test 2018-09-20 03:50:58 -11:00
jl777 8fc335afe1 Test 2018-09-20 03:49:47 -11:00
jl777 66bee980b5 Test 2018-09-20 03:49:07 -11:00
jl777 e45b565837 Test 2018-09-20 03:47:39 -11:00