Alrighttt
62991d393b
Merge pull request #9 from StakedChain/HFtest
...
H ftest
2018-09-19 13:37:28 -04:00
Homu
75c1dbc5eb
Auto merge of #3452 - LarryRuane:3399-peer-ban-test, r=bitcartel
...
Test peer banning logic in both pre- and post-initial block download states
The DoS ban scores are different for each, and it's nice to test both.
Follow-on from #3410 .
2018-09-19 10:25:23 -07:00
Alrighttt
3a9b050014
whoops
2018-09-19 18:52:22 +02:00
Alrighttt
d1b74ce6d1
hard fork mandatory update
2018-09-19 18:50:38 +02:00
blackjok3r
53771be236
make it so prints are diffrent.
2018-09-19 15:31:09 +08:00
blackjok3r
47656a74d0
;
2018-09-19 14:52:22 +08:00
blackjok3r
1444ed4e2d
add print of MoMoM data each time it is called.
2018-09-19 14:51:41 +08:00
blackjok3r
3eef88c755
Merge branch 'master' of https://github.com/StakedChain/komodo
...
ok
2018-09-19 13:47:59 +08:00
blackjok3r
4300a42d4d
Merge branch 'jl777-dev'
...
fix confilct
2018-09-19 13:47:03 +08:00
blackjok3r
876a6e0f9b
Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
...
fix merge conflict
2018-09-19 13:46:01 +08: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
Homu
4fc1066b6f
Auto merge of #3516 - str4d:3506-sendmany-sapling-t-ovk, r=ebfull
...
Generate an ovk to encrypt outCiphertext for t-addr senders
Closes #3506 .
2018-09-18 18:10:52 -07:00
Jack Grigg
bb4b6982e3
Generate an ovk to encrypt outCiphertext for t-addr senders
...
Closes #3506 .
2018-09-19 00:51:30 +01:00
Jack Grigg
bd3c860cb4
Use ovk directly in the TransactionBuilder API instead of fvk
2018-09-18 23:26:31 +01: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
jl777
08d66385b3
Test
2018-09-18 04:13:43 -11:00
jl777
403b69675c
1of2 CC
2018-09-18 03:48:44 -11:00
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
blackjok3rtt
c0128ed414
fix issue where if there are not two notarisations the MoMoM is indeterninate
2018-09-15 14:17:18 +08: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
