DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
22,879 Commits 5 Branches 7 Tags
b76ca3dc43dce40ca09b462803cb558f2c2e7249
Commit Graph
721 Commits
Author SHA1 Message Date
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
miketout 644c7445ec Latest Zcash updates 2018-09-20 13:32:57 -07:00
Homu 36243f41f1 Auto merge of #3520 - Eirik0:3327-sign-offline, r=bitcartel 
Fix signing raw transactions with unsynced offline nodes

This PR address the issue in two different ways:

- In `signrawtransaction` we determine the consensus branch ID (which we then later use to construct the transaction) using the chain height. We now also consider the `APPROX_RELEASE_HEIGHT` as this is a better estimation than 0 for the height of the chain if we are unsynced. (This in and of itself solves the Overwinter signing issue).
- We have added an additional parameter to `signrawtransaction` to allow manually overriding the consensus branch ID that zcashd determines we are on. This allows users to work around corner cases where the first strategy is still insufficient.

Closes #3327.
 2018-09-19 15:02:52 -07:00
Eirik Ogilvie-Wigley c10249f3de Remove unused import 2018-09-19 14:41:02 -06:00
Homu 25c3f903c1 Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d 
Add Sapling support to z_importwallet and z_exportwallet

Includes code adapted from upstream PR https://github.com/bitcoin/bitcoin/pull/8323

Closes #3218.
 2018-09-19 12:15:48 -07:00
Homu 379c7439a0 Auto merge of #3479 - Eirik0:rpc-test-cleanup, r=bitcartel 
Rpc test cleanup

The main purpose of this PR was to inline the method 'wait_for_async_operation_id' from util.py in tests where we were doing this manually. To make it work in all cases, I had to change the method to return the result in the case where the call failed. I also did a bit of general clean up (removing semicolons) in the files which I changed.
 2018-09-18 20:05:39 -07:00
miketout 9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07:00
Homu e95bdeabbf Auto merge of #3521 - bitcartel:sapling_json_data, r=str4d 
Add Sapling fields to JSON RPC output using TxToJSON.

Related to #3063 to add Sapling support to wallet RPCs.
 2018-09-18 12:13:14 -07:00
Simon 3501519bc8 Update qa test to check for Sapling related JSON fields. 2018-09-17 10:01:50 -07:00
Eirik Ogilvie-Wigley 40b9527301 Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with 2018-09-17 10:27:39 -06:00
Eirik Ogilvie-Wigley 19697025c6 Add test for signing raw transactions offline 2018-09-17 10:27:37 -06:00
Eirik Ogilvie-Wigley 5602e1f1a6 Allow passing timeout parameter to wait_and_assert_operationid_status 2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley e39f0e16c2 Remove unused imports 2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley 4d89d020a6 Remove unneeded semicolons 2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley f081d9cb02 Use utility method to wait for async operations 2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley 611f93244b Allow more information to be returned when an async rpc fails 2018-09-14 18:41:14 -06:00
Eirik Ogilvie-Wigley b37dc4e22f Don't export empty zip32 metadata 2018-09-14 18:36:24 -06:00
Eirik Ogilvie-Wigley 2fe39561ec Export zip32 metadata with sapling keys 2018-09-14 17:27:20 -06:00
Eirik Ogilvie-Wigley ae807af413 Export comment on HDSeed and fingerprint with wallet 2018-09-14 17:26:02 -06:00
Eirik Ogilvie-Wigley 9bcf90e2de Add sapling support to z_importwallet 2018-09-14 16:16:03 -06:00
Eirik Ogilvie-Wigley 5e360fb29f Add sapling spending keys to z_exportwallet 2018-09-14 15:07:15 -06:00
Michael Toutonghi 0c8fa56a02 All latest updates, smart contracts, including oracle from KMD/jl777 2018-09-13 13:00:13 -07:00
Jack Grigg 8e057ad9ee qa: Test both Overwinter and Sapling peer management 2018-09-12 12:15:37 +01:00
jl777 d6f91d8b96 Merge branch 'beta' into dev 2018-09-07 03:53:41 -11:00
Jack Grigg b7f9a7ae02 wallet: Comment out HDSeed and CHDChain persistence to disk 
Sapling keys generated from the seed are not yet persisted, so we don't
want to persist the seed or chain state either, otherwise the wallet
could end up in an inconsistent state.

Some tests are temporarily disabled because commenting out HDSeed
persistence breaks invariants inside CCryptoKeyStore.

Revert this commit during the PR for #3388.
 2018-09-03 10:45:37 +01:00
Jack Grigg af04224522 Fix file permissions of wallet_sapling RPC test 2018-09-03 08:27:33 +01:00
Jack Grigg 0f436a0a26 Fix RPC test that checks exact wording of cleaned-up error message 2018-09-03 08:23:09 +01:00
Anton Lysakov 624aa78700 Added more rewards CC tests 2018-09-01 15:01:53 +07:00
Anton Lysakov de6be280c4 Deleted test duplicate 2018-08-28 17:58:14 +07:00
Anton Lysakov aa54d54529 Described tokename dicename length limits 2018-08-28 17:48:47 +07:00
Anton Lysakov 881869c081 fixed local merge disorder 2018-08-28 17:37:31 +07:00
Anton Lysakov 6bd0c10acb More Dice CC tests 2018-08-28 17:32:59 +07:00
jl777 bca43f0215 Merge pull request #850 from jl777/dev 
Dev
 2018-08-27 09:36:28 -11:00
Jack Grigg e54c4d2ca1 rpcwallet: Add Sapling support to z_sendmany 2018-08-27 11:36:14 +01:00
Jonathan "Duke" Leto 124819cef5 Lots of error checking improvements and more passing tests 2018-08-27 00:55:53 +02:00
jl777 d0102c55fa Merge branch 'master' into beta 2018-08-24 09:00:53 -11:00
Jonathan "Duke" Leto d6635db93a Test for new behavior for faucets 2018-08-24 18:34:19 +02:00
Jonathan "Duke" Leto ade19d82a5 Grab changes from TonyL 2018-08-24 17:50:49 +02:00
Jonathan "Duke" Leto d90c7309e6 Better errors from diceinfo 2018-08-24 17:46:36 +02:00
jl777 292ca01f22 Merge branch 'master' into master 2018-08-24 00:43:24 -11:00
Jonathan "Duke" Leto 798686cb3c Fix up 2018-08-24 00:32:18 +02:00
Anton Lysakov 1c1efa160b more TokenCC tests 
(cherry picked from commit f3b2377d34bb03bae58a558c5beff4bb3b9e37dc)
 2018-08-24 04:44:41 +07:00
Jonathan "Duke" Leto e4452dc2dd Get tests passing again, by changing our test to check for an exception, which is the new behavior 2018-08-23 04:22:11 +02:00
Jonathan "Duke" Leto b8245a9397 enable cross chain CC stuff in tests 2018-08-22 10:11:05 +02:00
Jonathan "Duke" Leto df09c378ca Fix a test 2018-08-22 09:50:06 +02:00
Jonathan "Duke" Leto a03146b340 Lots more error checking in rewards and dice 2018-08-22 09:26:37 +02:00
Homu 622751da12 Auto merge of #3444 - LarryRuane:2982-mininode-version, r=str4d 
generalize mininode.py protocol versioning

Fixes #2982 -- replace `overwintered` boolean argument to NodeConn constructor with a protocol version integer, so that adding Sapling (and beyond) will be easier.
 2018-08-20 09:48:51 -07:00
Jonathan "Duke" Leto 8a3e1884d6 More token tests and more error checking and better errors from internals 2018-08-16 17:17:54 +02:00
Jonathan "Duke" Leto 8e0ff2b732 Test refactoring, more tests, and lots of error checking improvements and uint64_t fixes 2018-08-15 23:24:59 +02:00
Jonathan "Duke" Leto ef44dd00e1 more rewards tests 2018-08-15 10:21:59 +02:00