DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
32,189 Commits 6 Branches 7 Tags
master
Commit Graph
32189 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Asher Dawes 5f889cf83b fixing output muting of subroutine definition 2018-06-24 13:41:22 -07:00
David Dawes 058156b84b Build verus-cli, get dependencies nailed down. (#72) 
* Build verus-cli, get dependencies nailed down.

* Fiddling about with scripts.

* Clean READMEs up a bit.
 2018-06-24 13:25:27 -07:00
Michael Toutonghi 1a0fc30896 Fix importaddress with rescan error that prevented picking up UTXOs 2018-06-23 15:03:44 -07:00
Homu 0f091f228c Auto merge of #3356 - bitcartel:release-v1.1.2-rc1, r=bitcartel 
Release v1.1.2 rc1
 2018-06-22 21:53:15 -07:00
Simon 3ef8f7abb3 make-release.py: Updated release notes and changelog for 1.1.2-rc1. 2018-06-22 17:03:41 -07:00
Simon 5121fad00c make-release.py: Updated manpages for 1.1.2-rc1. 2018-06-22 17:03:41 -07:00
Simon 5cbbb7e375 make-release.py: Versioning changes for 1.1.2-rc1. 2018-06-22 16:55:20 -07:00
Homu f649bb36c5 Auto merge of #3303 - LarryRuane:2807-rpc-test-round-fees, r=bitcartel 
(rpc-test) accurately account for fee without rounding error

Fix for #2807, this test compares balances after doing key exports and imports, and expects these balances to be equal. But they are not exactly equal due to transaction fees, so the test makes them "equal" by rounding a value that has had fees taken out up to the nearest hundredth of a unit (which is much more than the default fee). This obviously is somewhat sloppy. It also converts a balance to float, which really should never be used due to loss of precision (use Decimal instead).

This change makes the test accurately account for the fee using precise comparisons, and removes the use of float. This test doesn't depend on the default fee (0.0001) but instead sets the fee (to that value). This way, if the default fee changes in the future, this test will continue to run. While testing these changes, I set the fee to various values (up to the max, 0.0190), and the test still passes.
 2018-06-22 14:01:48 -07:00
Simon a4ff089b2a Fix pyflakes error in test zkey_import_export. 2018-06-22 11:34:21 -07:00
Homu d5dcfa2b01 Auto merge of #3346 - bitcartel:3328_alert_non_overwinter_nodes, r=str4d 
Closes #3328. Send alert to put non-Overwinter nodes into safe mode.

The alert targets nodes running protocol version <= 170004.
Overwinter compatible nodes run protocol version >= 170005.
 2018-06-22 09:40:01 -07:00
Simon e56117f894 Closes #3328. Send alert to put non-Overwinter nodes into safe mode. 
The alert targets nodes running protocol version <= 170004.
Overwinter compatible nodes run protocol version >= 170005.
 2018-06-22 09:07:12 -07:00
Homu f587e61bda Auto merge of #3259 - leto:signmessage, r=str4d 
Clarify help that signmessage only works on taddrs
 2018-06-22 02:19:12 -07:00
Asher Dawes 6c0edb0c9e Merge pull request #70 from VerusCoin/dave-dev 
Fix Mac dependencies for libs depending on libs.
 2018-06-21 23:32:02 -07:00
David Dawes c71c99237b Fix Mac dependencies for libs depending on libs. 2018-06-21 23:30:17 -07:00
Duke Leto e5aa9f617b Fix absurd fee bug reported in #3281, with tests 2018-06-22 05:20:45 +00:00
David Dawes bb7771cc5a Merge pull request #69 from VerusCoin/dave-dev 
Get the 0.3.7 version change in the yml too.
 2018-06-21 21:18:57 -07:00
David Dawes 96a5d61613 Get the version change in the yml too. 2018-06-21 21:18:06 -07:00
David Dawes 18efc63695 Merge pull request #68 from VerusCoin/dave-dev 
Version to 0.3.7-beta
 2018-06-21 21:15:07 -07:00
David Dawes 3688b05860 Version to 0.3.7-beta 2018-06-21 21:12:52 -07:00
jl777 9d13e5c842 -addnode 2018-06-21 08:00:43 -11:00
jl777 ce3cd49fb7 Fix zilla 2018-06-21 07:57:56 -11:00
jl777 4c36b53066 +VRSC +RFOX 2018-06-21 07:27:09 -11:00
jl777 8154603bf3 Change entropy source for PoS to blockhash[-50] 2018-06-20 05:03:31 -11:00
jl777 c5ba245408 Merge pull request #700 from libscott/momo 
Cross chain fungibility
 2018-06-20 01:22:29 -11:00
Scott Sadler 45acf7d462 Merge remote-tracking branch 'jl/jl777' into momo 2018-06-19 20:50:56 -03:00
Scott Sadler 87d08c5a45 some comments 2018-06-19 20:39:04 -03:00
Homu f24d1ff546 Auto merge of #3337 - str4d:getblock-finalsaplingroot, r=bitcartel 
Add hashFinalSaplingRoot to getblockheader and getblock output
 2018-06-19 16:19:13 -07:00
Asher Dawes 7f86150727 Merge pull request #64 from VerusCoin/dave-dev 
Version up to 0.3.7
 2018-06-19 11:48:37 -07:00
Asher Dawes e64b7687de Merge pull request #67 from VerusCoin/dev 
Use portable hash for staking
 2018-06-19 11:46:53 -07:00
Homu 9acfa0067f Auto merge of #3258 - Eirik0:3056-anchor-test-cases, r=str4d 
Add tests for sapling anchors

Closes #3253
 2018-06-19 09:28:20 -07:00
Eirik Ogilvie-Wigley 762ee0e896 Rename typename 2018-06-19 10:07:00 -06:00
Eirik Ogilvie-Wigley 115b26cb27 Add BOOST_TEST_CONTEXT to distinguish sprout v. sapling 2018-06-19 10:06:21 -06:00
Scott Sadler 469bd6378f fix momom generation to inclusive or exclusive of whole blocks 2018-06-19 12:45:42 -03:00
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