hush
/
hush
8
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • bba1bee47e Ensure static link to boost for windows build. #128 FireMartZ 2018-05-09 22:40:33 -0400
  • b1806a7665
         Merge pull request #123 from me2space/dev FireMartZ 2018-05-09 22:29:53 -0400
  • 9481555462
         Merge branch 'dev' into dev #123 FireMartZ 2018-05-09 22:28:51 -0400
  • d9b59b6f8b More test merging. #125 FireMartZ 2018-05-09 21:38:08 -0400
  • 44f941adf7 Merge tests. FireMartZ 2018-05-09 21:19:22 -0400
  • 28015f58d0 That went missing in merge. FireMartZ 2018-05-09 21:02:30 -0400
  • ff02f317a8 Fix compilation. FireMartZ 2018-05-09 20:57:49 -0400
  • 6543f72368
         Update cross compile instructions. FireMartZ 2018-05-09 20:52:27 -0400
  • 0d3435b0ac
         Update cross compile instructions. #127 FireMartZ 2018-05-09 20:51:34 -0400
  • 2d985a4ab0 Merge missing method declaration. FireMartZ 2018-05-09 20:46:30 -0400
  • c876da2dac Another forgotten line to merge. FireMartZ 2018-05-09 19:25:41 -0400
  • 72fe85972c Merge one missing line. FireMartZ 2018-05-09 10:46:50 -0400
  • 649bd1a633 WIP: Merge zcash 1.0.15 FireMartZ 2018-05-08 21:52:52 -0400
  • 244105eec2
         Merge pull request #10 from MyHush/dev FireMartZ 2018-05-08 21:18:11 -0400
  • 81452d2717 Update HUSH Install Instructions 7rank 2018-05-02 12:21:49 -0400
  • e44f30222e Update node list from dev branch, since these nodes are no bueno and confuse people on Github Jonathan "Duke" Leto 2018-04-30 10:11:13 -0700
  • eda9d6cff3 Update zmq to 4.2.5 (to hopefully fix cross compiling issues). FireMartZ 2018-04-24 18:26:40 -0400
  • 99f2bfad6c Use what seems to be an unoptimized version for better cross compiling compatibility. Fixes windows build (other oses need to be tested). v1.0.14-rc1 FireMartZ 2018-04-23 17:00:07 -0400
  • 6eba16a7c8 Merge branch 'dev' of https://github.com/myhush/hush into dev FireMartZ 2018-04-15 20:29:17 -0400
  • a949ba79be Do not disable zmq on windows build. Needs to be tested before closing #122 FireMartZ 2018-04-15 20:17:37 -0400
  • 6d3cd3a2f9 Implement note locking for z_mergetoaddress Brad Miller 2018-03-15 15:58:31 -0600
  • 8706f91f4d Port upstream fix for z_importviewingkey bug Duke Leto 2018-04-08 01:04:11 -0700
  • c6bdfe2c4e Remove old bash completion files Jonathan "Duke" Leto 2018-03-24 01:16:43 -0700
  • 3c0ae1df37 Add bash completion from Zcash 4d6498b900 Jonathan "Duke" Leto 2018-03-24 01:05:07 -0700
  • 70bb24f368
         Merge pull request #121 from MyHush/z_listunspent Duke Leto 2018-03-23 22:17:40 -0700
  • ceff2ea7bd
         Merge pull request #102 from MyHush/zsendmany_duplicates Duke Leto 2018-03-23 08:48:17 -0700
  • 35b569cf86 Correct the RPC docs for z_listunspent #121 Duke Leto 2018-03-23 06:55:52 +0000
  • 64ebabc661 WIP Port z_listunspent from Zcash Jonathan "Duke" Leto 2018-03-22 19:57:12 -0700
  • c8edcba23a
         Merge pull request #117 from TheTrunk/dev Duke Leto 2018-03-22 17:54:04 -0700
  • f40fd344e3
         Removing founders reward #117 TheTrunk 2018-03-16 11:08:38 +0100
  • 681424a563
         Merge pull request #114 from OleksandrBlack/patch-2 Duke Leto 2018-03-12 12:58:55 -0700
  • 82c5344d10
         Merge pull request #115 from OleksandrBlack/patch-1 Duke Leto 2018-03-12 12:58:44 -0700
  • 796b04ea20
         Update chainparams.cpp #114 Lucky-Mining 2018-03-12 15:44:45 +0200
  • c6080062dd
         Update configure.ac #115 Lucky-Mining 2018-03-12 15:42:29 +0200
  • bff80bcb1e Merge branch 'zsendmany_duplicates' of github.com:MyHush/hush into zsendmany_duplicates #102 zsendmany_duplicates Jonathan "Duke" Leto 2018-03-08 14:46:33 -0800
  • a069942974 WIP tests for duplicate receivers in z_sendmany Jonathan "Duke" Leto 2018-03-08 14:46:20 -0800
  • de633ee0ee Merge branch 'dev' into zsendmany_duplicates Duke Leto 2018-03-07 22:46:11 +0000
  • 061446eddc Update unix man pages z_importviewingkey_bug Duke Leto 2018-03-07 22:39:13 +0000
  • a0d4aef94a
         Merge pull request #112 from FireMartZ/v1.0.13-rc FireMartZ 2018-03-06 12:08:56 -0500
  • 7701508b30
         Merge pull request #110 from MyHush/v1.0.14-dev Duke Leto 2018-03-05 14:59:00 -0800
  • 38b2a5f23a
         Merge pull request #111 from FireMartZ/v1.0.14-dev #110 FireMartZ 2018-03-05 17:09:26 -0500
  • 376bc35402 Change define for a mac compatible one. #111 FireMartZ 2018-03-05 17:03:43 -0500
  • ee57327641 Mac specific patch for clock_gettime FireMartZ 2018-03-05 16:33:34 -0500
  • 5806307783 Change 'long' to 'long long'. Fixes windows build. FireMartZ 2018-03-05 16:30:41 -0500
  • f9bd8b052a
         Merge pull request #109 from FireMartZ/v1.0.14-dev FireMartZ 2018-03-04 11:11:12 -0500
  • 497ebc3c80 Revert "Revert "WIP Merge one source file to linux compile."" FireMartZ 2018-03-04 11:07:14 -0500
  • eb16478624 Revert "Revert "WIP: Merge build files."" FireMartZ 2018-03-04 11:06:52 -0500
  • a471fbe2c4 Revert "WIP: Merge build files." FireMartZ 2018-03-04 10:59:12 -0500
  • d2c73d5d58 Revert "WIP Merge one source file to linux compile." FireMartZ 2018-03-04 10:58:28 -0500
  • 4057e9eaa1 Blank lines. #109 FireMartZ 2018-03-04 10:48:23 -0500
  • b3d2caaa77 Fix merge on those 2 files. FireMartZ 2018-03-03 23:26:27 -0500
  • b50c560c34 Fix last merge. Those methods are no more. FireMartZ 2018-03-03 21:36:12 -0500
  • 76d5f15158 Merge (what should be) the remaining source files. FireMartZ 2018-03-03 21:18:22 -0500
  • 796a9901c0 Merge non source files. FireMartZ 2018-03-03 20:17:40 -0500
  • 0612c6cf98 Use snark as-is. FireMartZ 2018-03-03 19:13:56 -0500
  • 8abdac1116 Merge from upstream 1.0.14 FireMartZ 2018-03-03 18:46:48 -0500
  • 5ff2d74c6e Merge branch 'v1.0.14-dev' of https://github.com/FireMartZ/hush into v1.0.14-dev FireMartZ 2018-03-03 14:55:10 -0500
  • 96d7146c41 Mac specific compile tweak. FireMartZ 2018-03-03 14:51:30 -0500
  • a2ac84adee Command must be single line. FireMartZ 2018-03-03 14:03:04 -0500
  • 26964a42fa Fix darwin build. FireMartZ 2018-03-03 13:54:51 -0500
  • 787dc5eff7 Merge branch 'v1.0.14-dev' of https://github.com/FireMartZ/hush into v1.0.14-dev FireMartZ 2018-03-03 09:02:12 -0500
  • 8aa007dd91 Update for darwin FireMartZ 2018-03-03 09:01:46 -0500
  • 10d0b68f9c Only linux supports those FireMartZ 2018-03-02 23:40:37 -0500
  • ecdfc2a341 Darwin flags. FireMartZ 2018-03-02 23:32:27 -0500
  • b367fe5b1a Another merge for linux build. FireMartZ 2018-03-02 22:56:45 -0500
  • 81cc4b6432 WIP: Merge more build mk files. FireMartZ 2018-03-02 22:36:37 -0500
  • 681e08a2c5 Darwin flags. FireMartZ 2018-03-02 22:20:32 -0500
  • d84b507996 Merge branch 'v1.0.14-dev' of https://github.com/FireMartZ/hush into v1.0.14-dev FireMartZ 2018-03-02 22:04:06 -0500
  • a93eee1716 WIP Merge one source file to linux compile. FireMartZ 2018-03-02 22:03:10 -0500
  • c238b88c2b
         Merge pull request #9 from MyHush/master FireMartZ 2018-03-02 21:31:52 -0500
  • 8783416c41 WIP: Merge build files. FireMartZ 2018-03-02 21:00:40 -0500
  • 72e2e60fe8 Merge branch 'dev' of github.com:MyHush/hush into dev Jonathan "Duke" Leto 2018-03-01 19:25:02 -0800
  • 9be947bd9b Remove old/wrong docs Jonathan "Duke" Leto 2018-03-01 19:24:39 -0800
  • 7741ae32a3
         Delete testbuild.txt FireMartZ 2018-03-01 22:17:58 -0500
  • 6a7a21c904
         Create testbuild.txt FireMartZ 2018-03-01 22:05:58 -0500
  • 81eba397a4 Complete changes to make this test pass. FireMartZ 2018-03-01 19:10:51 -0500
  • a4927bbca7 Make more wallet.py tests pass FireMartZ 2018-02-26 20:14:15 -0500
  • 9a76ecad01 Make some wallet.py tests pass Duke Leto 2018-02-26 23:30:43 +0000
  • 75d0fe8f04 s/BTC/HUSH/g in rpc tests Duke Leto 2018-02-26 22:51:48 +0000
  • ebf7b761c2 Start tracking Python deps required to run tests, to make it easier on devs Duke Leto 2018-02-26 22:44:49 +0000
  • 9dec75efe1 Fix references to BTC in rpc test readme Duke Leto 2018-02-26 18:46:32 +0000
  • 67cd138039 Merge branch 'dev' of https://github.com/MyHush/hush into dev Duke Leto 2018-02-26 18:43:31 +0000
  • 82d5c7a4e4 Make all Python RPC tests executable Duke Leto 2018-02-26 18:43:16 +0000
  • efd7e0f208 Merge branch 'dev' of github.com:MyHush/hush into dev Jonathan "Duke" Leto 2018-02-26 00:06:48 -0800
  • 07b9d14a72 Add Payment Disclosure documentation that was missed from upstream Jonathan "Duke" Leto 2018-02-26 00:06:40 -0800
  • 70ff876294
         Merge pull request #106 from FireMartZ/regtest_genesis Duke Leto 2018-02-25 08:57:13 -0800
  • 1d8c55ecc2 Generate a new regtest genesis block. The previous one was the zcash one. #106 FireMartZ 2018-02-25 10:44:02 -0500
  • cbc8128c34
         Merge pull request #6 from MyHush/dev FireMartZ 2018-02-25 09:40:58 -0500
  • 743ac166c2
         Remove duplicated file in uppercase DEBIAN folder. FireMartZ 2018-02-24 12:30:01 -0500
  • f8b751d993 Merge branch 'v1.0.13-bitcoreTLS' into dev FireMartZ 2018-02-24 08:22:43 -0500
  • 4bb23ba9e1 s/Zen/Hush/g Jonathan "Duke" Leto 2018-02-23 06:53:09 -0800
  • 44ce1531f2
         Merge pull request #105 from MyHush/v1.0.13-mac FireMartZ 2018-02-23 07:36:17 -0500
  • 72d3b53970 Put mac specific changes into mac specific files. Update mac build instructions. #105 v1.0.13-mac FireMartZ 2018-02-22 19:21:01 -0500
  • fdd09c1c09 Surround mac specific code with #ifdef __APPLE__ FireMartZ 2018-02-22 17:37:06 -0500
  • dd9811d7fc
         Merge pull request #104 from MyHush/master FireMartZ 2018-02-22 17:31:32 -0500
  • 83c4250979
         Remove duplicated discord link. #104 FireMartZ 2018-02-22 16:21:26 -0500
  • 091a93361f Merge branch 'dev' Jonathan "Duke" Leto 2018-02-22 12:57:40 -0800
  • 0c00b00494 s/zcashd/hushd/ Jonathan "Duke" Leto 2018-02-22 12:50:40 -0800
  • 6290469fc1 Add z_shieldcoinbase RPC docs from Zcash upstream that were missed in the 1.0.13 merged Jonathan "Duke" Leto 2018-02-22 10:21:00 -0800
  • 69d26697fe Sigh Jonathan "Duke" Leto 2018-02-22 09:33:19 -0800