DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
21,954 Commits 8 Branches 3 Tags
561a4a15ebe5b4e39d977bb619ebaef2ee659ef8
Commit Graph

21954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Homu
2ebde5860e Auto merge of #3326 - str4d:3058-sapling-addresses, r=str4d 
Sapling address encodings

This PR enables Sapling keys and addresses to be passed in anywhere Sprout keys
and addresses are used. Doing so will cause crashes until those places are updated
with Sapling support.

Includes code cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#11167
  - Only the `ConvertBits()` function.
- bitcoin/bitcoin#11630

Closes #3058.
 2018-06-19 05:12:50 -07:00
Asher Dawes
db3d3797de Merge branch 'master' into dave-dev 2018-06-18 19:16:18 -07:00
Homu
4e3ff06507 Auto merge of #3320 - str4d:macos-tests, r=bitcartel 
Fix MacOS tests

Includes code cherry-picked from upstream PR bitcoin/bitcoin#8270.
 2018-06-18 19:00:56 -07:00
Asher Dawes
5a2b557f51 Merge pull request #66 from verus-stuff/master 
Add a link to zawy LMWA and fix a typo
 2018-06-18 13:06:38 -07:00
Asher Dawes
e3cf77bb4b Merge pull request #65 from himu007/patch-11 
fix typo
 2018-06-18 13:02:07 -07:00
Sean Bowe
4e1f2daa0d Add get_esk() function to Sapling note encryption. 2018-06-18 13:14:43 -06:00
Jonathan "Duke" Leto
e123fd6fb7 Add a link to zawy LMWA and fix a typo 2018-06-18 11:42:08 -07:00
SHossain
62fff8332d fix typo 2018-06-18 17:34:27 +01:00
jl777
2321eb9875 Merge pull request #699 from lukechilds/dev 
Make src/fiat/zilla executable
 2018-06-18 03:59:55 -11:00
ca333
741af58af9 Merge pull request #40 from lukechilds/dev 
Make src/fiat/zilla executable
 2018-06-18 16:19:22 +02:00
Luke Childs
1c03ff0ecf Make src/fiat/zilla executable 2018-06-18 21:15:49 +07:00
ca333
f72ff13839 Merge pull request #39 from jl777/dev 
update dev
 2018-06-18 15:21:03 +02:00
Michael Toutonghi
fa733d13fa Use portable hash for staking 2018-06-17 14:58:06 -07:00
David Dawes
b7bf3f28cb Version up to 0.3.7 2018-06-17 13:58:42 -07:00
Scott Sadler
36f8002f93 fix GetNextBacknotarisation 2018-06-17 17:20:20 -03:00
Asher Dawes
e3938c8e9c Update makeReleaseMac.sh 
Reverting to working script
 2018-06-17 00:55:50 -07:00
Asher Dawes
6dbe67815a Update .gitlab-ci.yml 
fixing shell execution
 2018-06-17 00:46:45 -07:00
David Dawes
3234145c7c Merge pull request #63 from VerusCoin/dave-dev 
Make scripts executable.
 2018-06-17 00:06:18 -07:00
David Dawes
a6480e65d9 Make scripts executable. 2018-06-17 00:04:32 -07:00
Asher Dawes
52da02c269 Merge pull request #61 from VerusCoin/dave-dev 
Switching to curl from wget on Mac fetch-params.sh
 2018-06-16 23:55:53 -07:00
Asher Dawes
bf41da8865 Merge pull request #62 from VerusCoin/cleanup 
Remove obsolete makeRelease script.
 2018-06-16 23:55:43 -07:00
Asher Dawes
d9c3d519d0 cleaning up 2018-06-16 23:54:21 -07:00
Asher Dawes
2f36b0ef76 adding debian dependency list 2018-06-16 23:48:38 -07:00
David Dawes
b25e5ee7c3 Remove obsolete makeRelease script. 2018-06-16 23:47:06 -07:00
Asher Dawes
fd4f28767a Switching to curl from wget on Mac fetch-params.sh 
Renamed makeRelease to makeReleaseMac to make its purpose explicit.
Added makeReleaseWindows and makeReleaseLinux to put komodo binaries into their appropriate verus-cli package.
Attempting semi-automated versioning in GitLab CI
 2018-06-16 23:38:54 -07:00
David Dawes
31d0242b77 Merge pull request #60 from VerusCoin/dave-dev 
Get the verus and verusd attributes right.
 2018-06-16 22:37:42 -07:00
David Dawes
0a1a0b9d63 Get the verus and verusd attributes right. 2018-06-16 20:55:37 -07:00
Asher Dawes
8549044a3f Update makeRelease.sh 
Reverting to working state
 2018-06-16 20:48:07 -07:00
David Dawes
2a842910fe Merge pull request #59 from VerusCoin/dave-dev 
Remove extraneous stuff
 2018-06-16 18:41:23 -07:00
David Dawes
82c4fe3f5f Remove update script. Does not work with .dmg file. 2018-06-16 18:31:45 -07:00
David Dawes
8461774ba3 Clean up extraneous files, get these each build. 2018-06-16 18:30:16 -07:00
David Dawes
2a9c762932 Update verus-cli Mac README. 2018-06-16 18:24:15 -07:00
Asher Dawes
671d23d964 Merge pull request #57 from VerusCoin/dave-dev 
Get recursive dependencies
 2018-06-16 17:56:13 -07:00
Asherda
5a8e9a6463 modified fetch-params.sh in kmd/mac/verus-cli to put zcash params in the appropiate directory for macs 2018-06-16 17:39:06 -07:00
David Dawes
0bd9640924 Merge branch 'dave-dev' of github.com:VerusCoin/VerusCoin into dave-dev 2018-06-16 17:32:06 -07:00
David Dawes
67edc9df03 Another __cpuid() conflict. 2018-06-16 17:31:54 -07:00
Asher Dawes
9892a1762a Removing unnecessary step in build mac job and adding sast and code quality check 2018-06-16 17:24:33 -07:00
David Dawes
8d3dd709da Remove another __cpuid conflict. 2018-06-16 17:19:25 -07:00
David Dawes
033cd36e5b Merge branch 'dave-dev' of github.com:VerusCoin/VerusCoin into dave-dev 2018-06-16 17:09:30 -07:00
David Dawes
553727a86b Fiddling with __cpuid 2018-06-16 17:08:59 -07:00
David Dawes
4b054f2494 Undo the changes 2018-06-16 16:24:20 -07:00
David Dawes
16201a68c7 Undo inadvertent delete 2018-06-16 16:23:42 -07:00
David Dawes
f38d3e87e9 Merge latest. 2018-06-16 16:21:49 -07:00
David Dawes
3fd40915ac Approach not helping, trying the other direction. 2018-06-16 16:13:37 -07:00
Asher Dawes
8271276fd2 Troubleshooting Windows cpu id 2018-06-16 16:01:44 -07:00
David Dawes
8ef8d54b0d Unsigned, dang it. 2018-06-16 15:52:30 -07:00
David Dawes
1f06cfac22 Merge branch 'master' into dave-dev 2018-06-16 15:45:23 -07:00
David Dawes
c5a53ecb24 Use Windows specific __cpuid() for Windows. 2018-06-16 15:45:01 -07:00
David Dawes
d3c08b6ff9 Merge branch 'master' of github.com:VerusCoin/VerusCoin 2018-06-16 14:58:51 -07:00
David Dawes
87bbf1bfe5 Merge pull request #58 from VerusCoin/dev 
Portable VerusHash and CPU check
 2018-06-16 14:58:03 -07:00