DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Commit Graph

  • 14acb852d5 try again blackjok3r 2018-09-21 13:23:00 +08:00
  • 158d7befbc WTF!??!? blackjok3r 2018-09-21 13:11:12 +08:00
  • bb7815b05b that didnt work blackjok3r 2018-09-21 13:09:53 +08:00
  • 3dcbdcb85c try something else blackjok3r 2018-09-21 13:08:13 +08:00
  • 9f1e5ad6c0 runnign around in circles here, little sense! blackjok3r 2018-09-21 12:41:10 +08:00
  • 95918c6402 fix dumbness blackjok3r 2018-09-21 12:29:39 +08:00
  • feed6b75c9 Merge branch 'blackjok3r' of https://github.com/StakedChain/komodo into blackjok3r blackjok3r 2018-09-21 12:24:35 +08:00
  • 6bcd127f0b Merge branch 'master' into blackjok3r blackjok3rtt 2018-09-21 04:22:13 +00:00
  • a3c528d14e Merge branch 'blackjok3r' blackjok3rtt 2018-09-21 04:21:32 +00:00
  • de2936e90e Merge branch 'HFtest' blackjok3rtt 2018-09-21 03:55:06 +00:00
  • d5e3425710 Merge branch 'master' into HFtest blackjok3rtt 2018-09-21 03:54:50 +00:00
  • 6f3af3ff83 Change minsigs to 4, remove supply hack. blackjok3r 2018-09-21 11:46:25 +08:00
  • b7a3348ed1 change some stuff blackjok3r 2018-09-21 11:43:32 +08:00
  • 24f0f84417 try this blackjok3r 2018-09-21 11:20:09 +08:00
  • 79fe4fa6bd Merge pull request #24 from Asherda/dev miketout 2018-09-20 17:27:33 -07:00
  • f8de2bcdfe Fixing CI script Need to go back to the project's root dir before posting. Asher Dawes 2018-09-20 16:44:29 -07:00
  • f82b75eb8b Merge pull request #23 from Asherda/dev miketout 2018-09-20 16:12:13 -07:00
  • 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. Asher Dawes 2018-09-20 16:08:25 -07:00
  • 09dfacd0eb Don't reject based on erroneous version miketout 2018-09-20 14:07:16 -07:00
  • 644c7445ec Latest Zcash updates miketout 2018-09-20 13:32:57 -07:00
  • 75cd5b6b80 Merge pull request #22 from Asherda/dev miketout 2018-09-20 12:35:58 -07:00
  • 41c25e89db ? blackjok3r 2018-09-21 03:16:35 +08:00
  • 0f02546428 ? blackjok3r 2018-09-21 03:12:24 +08:00
  • 75a86d88a2 ? blackjok3r 2018-09-21 03:10:28 +08:00
  • f58cc01b5e ; blackjok3r 2018-09-21 02:58:53 +08:00
  • 9b97cb1a5d one more time blackjok3r 2018-09-21 02:54:13 +08:00
  • 44d8e00a25 +print jl777 2018-09-20 07:52:46 -11:00
  • 0af1486c79 Update .gitlab-ci.yml Asher Dawes 2018-09-20 11:31:46 -07:00
  • 550e9a54ac i blackjok3r 2018-09-21 02:19:24 +08:00
  • 9a241aa9c2 try again blackjok3r 2018-09-21 02:10:11 +08:00
  • dda0a48e8d ; blackjok3r 2018-09-21 01:48:37 +08:00
  • 71d6712d8d Test jl777 2018-09-20 06:47:08 -11:00
  • 47cd790436 try staked.h again blackjok3r 2018-09-21 01:46:02 +08:00
  • af8470697b Merge branch 'blackjok3r' into HFtest blackjok3rtt 2018-09-20 16:54:54 +00:00
  • 94ceb6e39e Merge branch 'HFtest' into blackjok3r blackjok3rtt 2018-09-20 16:54:32 +00:00
  • 9e417e48d7 Change min protcol version so STAKED chains have their own value, so KMD can still work. blackjok3r 2018-09-20 23:15:00 +08:00
  • 68da1c69bd Test jl777 2018-09-20 03:50:58 -11:00
  • 8fc335afe1 Test jl777 2018-09-20 03:49:47 -11:00
  • 66bee980b5 Test jl777 2018-09-20 03:49:07 -11:00
  • e45b565837 Test jl777 2018-09-20 03:47:39 -11:00
  • 4ab5f2f1d7 Test jl777 2018-09-20 03:46:55 -11:00
  • 627cd0f559 Assets 't' exemption jl777 2018-09-20 03:45:37 -11:00
  • 3330881171 Use min sigs = 3 for staked chains, so we can add more pubkeys. blackjok3r 2018-09-20 22:44:41 +08:00
  • ff3116ce3c Chance for AssetConvert to validate jl777 2018-09-20 02:55:45 -11:00
  • b8deecdc09 Sapling transaction testing miketout 2018-09-20 03:08:36 -07:00
  • 2884a3f64a Test jl777 2018-09-19 22:35:50 -11:00
  • dceeaa3dc5 Test jl777 2018-09-19 22:35:08 -11:00
  • 1605948a06 Test jl777 2018-09-19 22:18:51 -11:00
  • 9eece428bb Test jl777 2018-09-19 22:15:50 -11:00
  • 009f09069b Remove dualmode for gateways jl777 2018-09-19 22:08:09 -11:00
  • 541e5e9249 Token convert jl777 2018-09-19 21:51:56 -11:00
  • 7d6f7d7ea5 PricesAddFunding jl777 2018-09-19 21:34:25 -11:00
  • a51c08d1a1 Test jl777 2018-09-19 21:32:22 -11:00
  • 06c4e87ff9 CCprices.h jl777 2018-09-19 21:29:11 -11:00
  • feb11ae038 std::vector<CPubKey>pubkeys; jl777 2018-09-19 21:18:15 -11:00
  • f6b969d4b4 Test jl777 2018-09-19 21:17:06 -11:00
  • 816acd6719 Test jl777 2018-09-19 21:14:25 -11:00
  • 5efdb4f325 N jl777 2018-09-19 21:10:58 -11:00
  • bfd7858525 Syntax jl777 2018-09-19 21:09:27 -11:00
  • f44cd67e82 Prices stub jl777 2018-09-19 21:04:47 -11:00
  • 36243f41f1 Auto merge of #3520 - Eirik0:3327-sign-offline, r=bitcartel Homu 2018-09-19 15:02:52 -07:00
  • c10249f3de Remove unused import Eirik Ogilvie-Wigley 2018-09-19 14:41:02 -06:00
  • 25c3f903c1 Auto merge of #3491 - Eirik0:3218-sapling-import-export-wallet, r=str4d Homu 2018-09-19 12:15:48 -07:00
  • c2059876c3 Update version.h Alrighttt 2018-09-19 13:38:33 -04:00
  • 62991d393b Merge pull request #9 from StakedChain/HFtest Alrighttt 2018-09-19 13:37:28 -04:00
  • 75c1dbc5eb Auto merge of #3452 - LarryRuane:3399-peer-ban-test, r=bitcartel Homu 2018-09-19 10:25:23 -07:00
  • 3a9b050014 whoops Alrighttt 2018-09-19 18:52:22 +02:00
  • d1b74ce6d1 hard fork mandatory update Alrighttt 2018-09-19 18:50:38 +02:00
  • 53771be236 make it so prints are diffrent. blackjok3r 2018-09-19 15:31:09 +08:00
  • 47656a74d0 ; blackjok3r 2018-09-19 14:52:22 +08:00
  • 1444ed4e2d add print of MoMoM data each time it is called. blackjok3r 2018-09-19 14:51:41 +08:00
  • 3eef88c755 Merge branch 'master' of https://github.com/StakedChain/komodo blackjok3r 2018-09-19 13:47:59 +08:00
  • 4300a42d4d Merge branch 'jl777-dev' blackjok3r 2018-09-19 13:47:03 +08:00
  • 876a6e0f9b Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev blackjok3r 2018-09-19 13:46:01 +08:00
  • 379c7439a0 Auto merge of #3479 - Eirik0:rpc-test-cleanup, r=bitcartel Homu 2018-09-18 20:05:39 -07:00
  • 4fc1066b6f Auto merge of #3516 - str4d:3506-sendmany-sapling-t-ovk, r=ebfull Homu 2018-09-18 18:10:52 -07:00
  • bb4b6982e3 Generate an ovk to encrypt outCiphertext for t-addr senders Jack Grigg 2018-09-19 00:51:30 +01:00
  • bd3c860cb4 Use ovk directly in the TransactionBuilder API instead of fvk Jack Grigg 2018-09-18 23:22:50 +01:00
  • 9feb4b9e08 Major updates integration from all upstreams miketout 2018-09-18 14:33:53 -07:00
  • e95bdeabbf Auto merge of #3521 - bitcartel:sapling_json_data, r=str4d Homu 2018-09-18 12:13:14 -07:00
  • 08d66385b3 Test jl777 2018-09-18 04:13:43 -11:00
  • 403b69675c 1of2 CC jl777 2018-09-18 03:48:44 -11:00
  • 49356ed798 Auto merge of #3512 - str4d:3487-nu-peer-management, r=ebfull Homu 2018-09-18 04:25:54 -07:00
  • 61ee7d9ad2 Merge branch 'jl777' into FSM jl777 2018-09-17 06:02:03 -11:00
  • 3501519bc8 Update qa test to check for Sapling related JSON fields. Simon 2018-09-17 10:01:50 -07:00
  • c5164b3c7b Skip human help if longer chain is invalid due to notarization jl777 2018-09-17 05:58:07 -11:00
  • 9ba7479de1 Add Sapling fields to JSON RPC output using TxToJSON. Simon 2018-09-17 09:44:43 -07:00
  • 36a490677c Allow passing branchId when calling signrawtransaction Eirik Ogilvie-Wigley 2018-09-17 09:49:32 -06:00
  • 40b9527301 Incorporate APPROX_RELEASE_HEIGHT when determining what consensus branch to sign with Eirik Ogilvie-Wigley 2018-09-13 16:55:18 -06:00
  • 19697025c6 Add test for signing raw transactions offline Eirik Ogilvie-Wigley 2018-09-13 16:34:23 -06:00
  • 9662fa3864 Merge branch 'jl777' into FSM jl777 2018-09-17 03:16:21 -11:00
  • 9648870fdc Sync gateways jl777 2018-09-17 03:16:04 -11:00
  • 416c90c291 Merge branch 'dev' into jl777 jl777 2018-09-17 03:14:01 -11:00
  • 4f80a29cc4 Test jl777 2018-09-17 03:12:56 -11:00
  • 791ad592f1 Test jl777 2018-09-17 03:09:39 -11:00
  • 7fccea1dab Msig suppport jl777 2018-09-17 03:08:28 -11:00
  • 40a9d28a48 Merge pull request #60 from jl777/dev ca333 2018-09-17 15:29:24 +02:00
  • 8b69b0cb12 Merge pull request #61 from jl777/master ca333 2018-09-17 15:28:50 +02:00
  • 12832b1d22 notarization check for asset chains jl777 2018-09-17 01:04:30 -11:00
  • 6b52965769 Stronger check for asset chain notarizations jl777 2018-09-17 01:03:14 -11:00