Commit Graph
32095 Commits
Author SHA1 Message Date
blackjok3r 0f02546428 ? 2018-09-21 03:12:24 +08:00
blackjok3r 75a86d88a2 ? 2018-09-21 03:10:28 +08:00
blackjok3r f58cc01b5e ; 2018-09-21 02:58:53 +08:00
blackjok3r 9b97cb1a5d one more time 2018-09-21 02:54:13 +08: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
blackjok3r 550e9a54ac i 2018-09-21 02:19:24 +08:00
blackjok3r 9a241aa9c2 try again 2018-09-21 02:10:11 +08:00
blackjok3r dda0a48e8d ; 2018-09-21 01:48:37 +08:00
jl777 71d6712d8d Test 2018-09-20 06:47:08 -11:00
blackjok3r 47cd790436 try staked.h again 2018-09-21 01:46:02 +08:00
blackjok3rtt af8470697b Merge branch 'blackjok3r' into HFtest
merge fix
2018-09-20 16:54:54 +00:00
blackjok3rtt 94ceb6e39e Merge branch 'HFtest' into blackjok3r
fix merg conflict
2018-09-20 16:54:32 +00:00
blackjok3r 9e417e48d7 Change min protcol version so STAKED chains have their own value, so KMD
can still work.
2018-09-20 23:15:00 +08: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
jl777 4ab5f2f1d7 Test 2018-09-20 03:46:55 -11:00
jl777 627cd0f559 Assets 't' exemption 2018-09-20 03:45:37 -11:00
blackjok3r 3330881171 Use min sigs = 3 for staked chains, so we can add more pubkeys. 2018-09-20 22:44:41 +08:00
jl777 ff3116ce3c Chance for AssetConvert to validate 2018-09-20 02:55:45 -11:00
miketout b8deecdc09 Sapling transaction testing 2018-09-20 03:08:36 -07:00
jl777 2884a3f64a Test 2018-09-19 22:35:50 -11:00
jl777 dceeaa3dc5 Test 2018-09-19 22:35:08 -11:00
jl777 1605948a06 Test 2018-09-19 22:18:51 -11:00
jl777 9eece428bb Test 2018-09-19 22:15:50 -11:00
jl777 009f09069b Remove dualmode for gateways 2018-09-19 22:08:09 -11:00
jl777 541e5e9249 Token convert 2018-09-19 21:51:56 -11:00
jl777 7d6f7d7ea5 PricesAddFunding 2018-09-19 21:34:25 -11:00
jl777 a51c08d1a1 Test 2018-09-19 21:32:22 -11:00
jl777 06c4e87ff9 CCprices.h 2018-09-19 21:29:11 -11:00
jl777 feb11ae038 std::vector<CPubKey>pubkeys; 2018-09-19 21:18:15 -11:00
jl777 f6b969d4b4 Test 2018-09-19 21:17:06 -11:00
jl777 816acd6719 Test 2018-09-19 21:14:25 -11:00
jl777 5efdb4f325 N 2018-09-19 21:10:58 -11:00
jl777 bfd7858525 Syntax 2018-09-19 21:09:27 -11:00
jl777 f44cd67e82 Prices stub 2018-09-19 21:04:47 -11: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
Alrighttt c2059876c3 Update version.h 2018-09-19 13:38:33 -04:00
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