Commit Graph

23948 Commits

Author SHA1 Message Date
Homu
49356ed798 Auto merge of #3512 - str4d:3487-nu-peer-management, r=ebfull
Make NU peer management logic upgrade-agnostic

Closes #3487.
2018-09-18 04:25:54 -07:00
jl777
61ee7d9ad2 Merge branch 'jl777' into FSM 2018-09-17 06:02:03 -11:00
Simon
3501519bc8 Update qa test to check for Sapling related JSON fields. 2018-09-17 10:01:50 -07:00
jl777
c5164b3c7b Skip human help if longer chain is invalid due to notarization 2018-09-17 05:58:07 -11:00
Simon
9ba7479de1 Add Sapling fields to JSON RPC output using TxToJSON. 2018-09-17 09:44:43 -07:00
Eirik Ogilvie-Wigley
36a490677c Allow passing branchId when calling signrawtransaction 2018-09-17 10:27:39 -06: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
jl777
9662fa3864 Merge branch 'jl777' into FSM 2018-09-17 03:16:21 -11:00
jl777
9648870fdc Sync gateways 2018-09-17 03:16:04 -11:00
jl777
416c90c291 Merge branch 'dev' into jl777 2018-09-17 03:14:01 -11:00
jl777
4f80a29cc4 Test 2018-09-17 03:12:56 -11:00
jl777
791ad592f1 Test 2018-09-17 03:09:39 -11:00
jl777
7fccea1dab Msig suppport 2018-09-17 03:08:28 -11:00
ca333
40a9d28a48 Merge pull request #60 from jl777/dev
dev update
2018-09-17 15:29:24 +02:00
jl777
12832b1d22 notarization check for asset chains 2018-09-17 01:04:34 -11:00
jl777
6b52965769 Stronger check for asset chain notarizations 2018-09-17 01:03:14 -11:00
jl777
119f1c1e0c Asset chain notarization check 2018-09-17 01:02:32 -11:00
jl777
d2bcb614c3 Merge branch 'dev' into jl777 2018-09-15 21:50:40 -11:00
jl777
34bc8189ff Merge pull request #882 from jl777/FSM
prepare for gateways multisig and add notarization check to disconnect tip
2018-09-15 21:50:18 -11:00
jl777
8ccb74fb8e -p 2018-09-15 21:48:31 -11:00
jl777
a6a00b5ca2 Test 2018-09-15 21:47:43 -11:00
jl777
f9d85c8f86 Check for notarized in disconnect tip 2018-09-15 21:46:46 -11: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
Jonas Schnelli
002753ae64 [Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull()
Zcash: modified for zip32
2018-09-14 17:17:24 -06:00
Jonas Schnelli
82e71233b0 [Wallet] print hd masterkeyid in getwalletinfo
Zcash: modified for zip32
2018-09-14 16:59:56 -06:00
Jonas Schnelli
b6d1af89f2 [Wallet] extend CKeyMetadata with HD keypath
Zcash: modified for zip32
2018-09-14 16:59:51 -06:00
Eirik Ogilvie-Wigley
9bcf90e2de Add sapling support to z_importwallet 2018-09-14 16:16:03 -06:00
Eirik Ogilvie-Wigley
0f03de5536 Return more information when adding a spending key 2018-09-14 16:00:47 -06:00
Eirik Ogilvie-Wigley
fcab001b1e Move AddSpendingKeyToWallet 2018-09-14 15:44:03 -06:00
Eirik Ogilvie-Wigley
a0783bb957 Rename AddZKey to include sprout 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
5e360fb29f Add sapling spending keys to z_exportwallet 2018-09-14 15:07:15 -06:00
Eirik Ogilvie-Wigley
d6b31d59b5 Rename map to include sprout 2018-09-14 15:07:15 -06:00
jl777
167794e0dd Merge pull request #881 from Alrighttt/dev
build error, fix typo
2018-09-14 05:09:50 -11:00
Alrighttt
87f37301b4 build error, fix typo 2018-09-14 17:57:04 +02:00
jl777
f4e8439469 - 2018-09-14 00:16:16 -11:00
jl777
d3be9b4470 Initial channels CC doc 2018-09-13 23:57:57 -11:00
Michael Toutonghi
0c8fa56a02 All latest updates, smart contracts, including oracle from KMD/jl777 2018-09-13 13:00:13 -07:00
Asher Dawes
6674ecf970 Merge pull request #125 from VerusCoin/Asherda-patch-1
Update verus
2018-09-13 12:55:13 -07:00
Asher Dawes
d974a5c0e4 Update verus
fixed path for komodo-cli
2018-09-13 12:54:52 -07:00
jl777
b71da7105f Test 2018-09-13 06:06:26 -11:00
jl777
1deabac47a Test 2018-09-13 06:05:29 -11:00
jl777
ea17adb690 Test 2018-09-13 06:04:41 -11:00