LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Serialize effective amount #231

Closed
bvbfan wants to merge 309 commits from serialize_effective_amount into master
pull from: serialize_effective_amount
merge into: LBRYCommunity:master
Conversation 1 Commits 309 Files changed 126 +1

309 commits

Author SHA1 Message Date
Anthony Fieroni
ffd03da347 Serialize effective amount 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2018-10-30 16:14:57 +02:00
Brannon King
24da3ac57a fixed incompatibility with newer lbssl 2018-10-19 11:30:48 -06:00
Anthony Fieroni
1578807503 Remove unnecessary copies 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2018-10-19 11:20:27 -06:00
kay kurokawa
451f4b4aca
bumped release version to 0.12.2.3 2018-10-15 13:42:36 -04:00
kay kurokawa
d5db27b61a
Remove lines that are no longer used after removal of logging line in 7eca4f0 2018-10-15 13:29:45 -04:00
kay kurokawa
7eca4f00a7
Remove excessive logging when writing nodes on claimtrie to disk 2018-10-13 15:15:01 -04:00
Brannon King
bdfda3c267
Deployment: added S3, added SHA256, renewed GitHub credentials, brew upgrade 2018-10-01 11:32:53 -06:00
Brannon King
fa35ccbe78 bumped release version to 0.12.2.2 2018-09-26 13:14:20 -06:00
Anthony Fieroni
ebeb2bd092 Specify non-standard transaction error when it's dust 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2018-09-05 11:05:43 -04:00
lbrynaut
72cbc491be
Merge pull request #192 from lbryio/verify_claimid 
Do not create transactions with incorrect claims
 2018-09-04 08:17:47 -05:00
lbrynaut
0113a3ad70
Merge pull request #194 from shyba/claim_index_tests 
add extra tests for the claim index
 2018-09-04 07:55:02 -05:00
lbrynaut
9b7a70e8de
Merge pull request #197 from lbrynaut/claimindex-fix 
Fix incorrect usage of the claim index
 2018-09-03 11:25:16 -05:00
Anthony Fieroni
46381f603b Do not create transactions with incorrect claims 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2018-08-31 11:08:52 +03:00
Brannon King
69ee021469
added scripts to generate parsable API docs (#187) 
also included the generated docs
also changed Travis build script to not run the formatting check on OSX
 2018-08-30 14:18:48 -06:00
lbrynaut
e5d80b0f51 Fix incorrect usage of the claim index so that we can properly 
maintain state through re-orgs and delayed activation states.

Includes get_claim_by_id_test_2 and get_claim_by_id_test_3 written by
Kay.
 2018-08-28 09:25:30 -05:00
Victor Shyba
d93f4d8b09 add extra tests for the claim index 2018-08-20 23:59:41 -03:00
Victor Shyba
368a7389f4
refactor getValueForClaim, fix off by one error in the conditional statement that could cause segfault 2018-08-20 14:42:07 -04:00
Brannon King
7c3ef9b635 moved claimtrie_tests into claimtriebranching_tests 
to take advantage of the test fixture there

added counts & hash checks to tests

also ran the code format tool

ran the formatting tool

cleaned up the earlier question on hashes, fixed crash bug

ran formatter
 2018-08-07 16:03:53 -06:00
Brannon King
6fa9ee58e3 Added cmake support for CLion intellisense 
(not to be used for a full compile of the project)
 2018-08-03 14:35:37 -06:00
Thomas Zarebczan
b71107c2b3
Merge pull request #182 from ocornoc/master 
Fixed spacing so OS paths show up on different lines
 2018-07-30 13:22:19 -07:00
ocornoc
93daca0614 Fixed spacing so OS paths show up on different lines 2018-07-30 11:23:48 -07:00
winder
e381336281
Sanitize claimtrie RPC commands. 2018-07-19 15:03:05 -04:00
lbrynaut
30c65694b9 Ensure bool is allocated for later assignment(s) 2018-07-16 09:17:30 -04:00
lbrynaut
84542d98d1 Re-enable OS X tests to see what's going wrong 2018-07-16 09:17:30 -04:00
kay kurokawa
b9a1b60555 install clang-format for osx, do not add remote origin2 if it already exists for clang formatting check in reproducible_build.sh 2018-07-11 12:15:43 -04:00
kay kurokawa
aed3b9b148 add a comment about nProportionalDelayFactor for a test on claimtriebranching_tests.cpp 
Signed-off-by: kay kurokawa <kay@lbry.io>
 2018-07-08 15:05:26 -04:00
kaykurokawa
48d51418ef Add option to peform clang formatting check on reproducible_build.sh, run it in travis. Adjust README contributing guidelines. 2018-06-27 22:09:35 -04:00
kay kurokawa
50facca935 NOT FOR UPSTREAM MERGE Update .clang-format to latest in Bitcoin Core. Update doc/developer-notes to latest in Bitcoin Core, but use C++03 2018-06-27 22:09:35 -04:00
lbrynaut
e90d7f54ce
Merge pull request #165 from lbrynaut/osx-travis 
Resolves OS X Travis build issue
 2018-06-26 14:37:47 -05:00
lbrynaut
2587130e45 OSX Travis fix 2018-06-26 13:57:58 -05:00
kaykurokawa
f4be61d90a normalize difficulty so that 1 == minmum difficulty 2018-06-19 11:48:40 -04:00
Alex Grin
047abede75
Merge pull request #161 from PenTesting/patch-1 
Regex hardening to fix CVE-2018-12356.
 2018-06-18 12:31:03 -04:00
PenTesting
4a1bf7bb51
Regex hardening to fix CVE-2018-12356. 2018-06-18 08:07:41 +03:00
kay kurokawa
a407c10b02 add note about c++ version, adjust formatting in README 2018-06-04 13:31:18 -07:00
lbrynaut
995b5a6666 Update doc string for claim's valid_at_height parameter 2018-05-30 12:10:47 -07:00
lbrynaut
4badde8595 Add support information to getclaimbyid rpc 2018-05-30 12:10:47 -07:00
kaykurokawa
6cce052bf7 add a data directory section to README, fix util.cpp comment to list the proper lbrycrd default data directories 2018-05-30 12:08:09 -07:00
lbrynaut
df4a86a0df
Merge pull request #147 from bvbfan/openssl-fix 
Fix openssl build on 32 bit Linux
 2018-05-29 08:15:25 -05:00
kay kurokawa
11f5bf4243 updated version to 0.12.2.0 2018-05-27 22:57:12 -07:00
kay kurokawa
5d22b17af5 fix fPowAllowMinDifficultyBlocks implementation on testnet so that it only affects block 277300 and onwards 2018-05-25 12:02:36 -04:00
Anthony Fieroni
4a2738ddf1 Fix openssl build on 32 bit Linux 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2018-05-25 08:07:15 +03:00
kay kurokawa
4e147cb380 Extend expiration of pre fork claims and supports. Adjust and add unit test for the extended expiration hardfork. 2018-05-24 00:30:07 -04:00
lbrynaut
dc34766423 Implement a hard fork for extended claim expiration times. Added unit tests for extended claim expiration. 2018-05-24 00:30:07 -04:00
lbrynaut
cd10b981b1
Merge pull request #141 from lbryio/fix-testnet-pow 
fix fPowAllowMinDifficultyBlocks to work on the testnet
 2018-05-21 15:16:24 -05:00
kay kurokawa
fe493bff9e fix fPowAllowMinDifficultyBlocks to work on the testnet 2018-05-21 15:46:10 -04:00
lbrynaut
7930840005 Add a simple claim by id test 2018-05-18 13:15:43 -04:00
lbrynaut
d5df3ff10d Simplify the claim index by reducing the memory cache in exchange for 
slightly higher latency calls to leveldb

Add a simple claim by id test
 2018-05-18 13:15:43 -04:00
lbrynaut
a0221c3bf7 Add a claim index for fast reference by id 2018-05-18 13:15:43 -04:00
kay kurokawa
c3d315ed49 add information regarding testnet on README 2018-05-16 15:41:17 -04:00
kay kurokawa
e120c1de69 best_claim_effective_amount_equals was not using getEffectiveAmountForClaim 2018-05-14 17:48:50 -04:00
kay kurokawa
6fc7e0860e update version to 0.12.1.2 2018-04-25 15:38:46 -04:00
Victor Shyba
1d071a9998 fix bug in CClaimTrie::getEffectiveAmountForClaim 2018-04-23 13:35:44 -04:00
Victor Shyba
6b13bd1d45 Add tests for CClaimTrie::getEffectiveAmountForClaim 2018-04-23 13:35:44 -04:00
Alex Grin
c0f7584503
Update README.md 2018-04-19 14:55:22 -04:00
Alex Grin
ff07b5b927
Update README.md 2018-04-19 14:54:45 -04:00
kay kurokawa
4e1df4de23 update README 2018-04-18 17:04:43 -04:00
Kay Kurokawa
4ff143387e integrate new CalcMinClaimTrieFee function into the memory pool check and wallet transaction creation. 
increase DEFAULT_TRANSACTION_MAXFEE to accomodate the claim trie minimum fee that will exceed 0.1 credits.
 2018-04-18 16:54:11 -04:00
Kay Kurokawa
8817a7df51 Add new function CalcMinClaimTrieFee to calulate the fee required for claimtrie transactions 2018-04-18 16:54:11 -04:00
Kay Kurokawa
6f0b24d62d add comment about what recursivePruneName does 2018-04-18 16:24:32 -04:00
Kay Kurokawa
62f4bedb17 add unit test for recursivePruneName and merklehash computation test in claimtriecache_tests.cpp 2018-04-18 16:24:32 -04:00
kay kurokawa
0a2c49911d use specific version 2.0.22 stable of libevent in reproducible builds 2018-04-18 12:10:47 -04:00
Kay Kurokawa
2f7c03cbe8 added a sanity check for making sure updates extend the expiration in claimtriebranching_tests, fixed white space 2018-04-16 12:32:51 -04:00
Kay Kurokawa
172f6aca32 remove debugging variable bnOld in retarget algorithm, clean up white spaces 2018-04-02 16:26:04 -04:00
Kay Kurokawa
d26db867dd removed whitespaces at end of line in file rpcwallet.cpp 2018-03-12 09:35:08 -04:00
Kay Kurokawa
39580f1740 RPC commands updateclaim and nameclaim now takes argument "value" as hexadecimal encoded string 2018-03-12 09:35:08 -04:00
LBRY Docs
29bc408431 update LICENSE to 2018 2018-02-16 12:51:15 -05:00
Umpei Kay Kurokawa
dffd498152
Merge pull request #94 from lbryio/fix_memory_leak 
Fix memory leak
 2018-02-16 10:14:35 -05:00
Kay Kurokawa
a2fa2c0720 supportExpirationQueueCache was not cleared with the rest of the cache objects 
Signed-off-by: Kay Kurokawa <kay@lbry.io>
 2018-02-09 20:16:09 -05:00
Kay Kurokawa
b2ba3f5ea0 Fix memory leak where a new unaltered CClaimTrieNode would be created in addNodeToCache() for the convenient purpose of copying by value, but would never be freed 
Signed-off-by: Kay Kurokawa <kay@lbry.io>
 2018-02-09 20:15:33 -05:00
Alex Grintsvayg
52628772b3 spaces 2018-01-16 11:05:37 -05:00
Alex Grintsvayg
cc84e7fb91 move build docs into readme 2018-01-16 10:59:52 -05:00
Alex Grintsvayg
04b3983844 readme 2018-01-16 10:56:44 -05:00
Alex Grintsvayg
83e1df0403 install doc 2018-01-16 10:51:23 -05:00
Alex Grin
fbbf63fa54
Update README.md 2018-01-16 10:35:36 -05:00
Alex Grin
3238cd9735
Update build-osx.md 2018-01-08 10:31:15 -05:00
Alex Grin
047e41be82
Update build-osx.md 2018-01-08 10:30:52 -05:00
Alex Grin
cb9c633936
Merge pull request #79 from lbryio/fix_support_abandon 
Fix lbrycrd crashing
 2017-12-29 10:03:47 -05:00
Kay Kurokawa
d29f110a11 fix bug where we did not check the root node in the cache when reordering the trie 2017-12-28 11:43:14 -05:00
Kay Kurokawa
40e034ef1b add logging messages to debug the crashing support on abandon issue 2017-12-28 11:43:14 -05:00
Kay Kurokawa
865f746636 add unit test to see if having a support and an abandon in the same block when there are not other claim will crash lbryrcrd 2017-12-28 11:43:10 -05:00
Umpei Kay Kurokawa
6179347045 Merge pull request #70 from lbryio/fix_getblocktemplate 
Fix getblocktemplate command not returning the correct claimtrie hash
 2017-09-13 12:14:07 -04:00
Kay Kurokawa
b2216fd270 fix getblocktemplate command not returning the correct claimtrie hash 2017-09-13 12:08:39 -04:00
Alex Grintsvayg
5a1d288b17 bump build after merging PRs 2017-09-13 09:12:59 -04:00
Alex Grintsvayg
800bb51fbf Merge 'mkg20001:patch-1' 
* commit '30e94119':
  Fix currency unit
  Branding
  Change CURRENCY_UNIT and BitcoinUnits::name
 2017-09-13 09:09:54 -04:00
mkg20001
30e941195a Fix currency unit 2017-09-13 09:09:30 -04:00
mkg20001
32e73f4586 Branding 
Replace the Bitcoin logo with the LBRY logo
 2017-09-13 09:09:30 -04:00
mkg20001
d438e9f968 Change CURRENCY_UNIT and BitcoinUnits::name 
This will show LBRY instead of BTC
 2017-09-13 09:09:30 -04:00
Procrastinator
20ae466765 Replace Satoshi subversion with LBRY 
Distinguishes lbry nodes from bitcoin nodes
 2017-09-13 09:08:39 -04:00
Jack Robison
84b093b981
bump version to 0.12.0.5 2017-08-14 10:51:55 -04:00
Jack Robison
84f074b9fa
Merge branch 'getclaimbyid' 2017-08-14 10:20:07 -04:00
Jack Robison
7a0724098f
feedback from kay 2017-08-08 18:49:25 -04:00
Jack Robison
04d77ab376
add getclaimbyid 2017-08-08 10:18:34 -04:00
Jack Robison
24d5e64d0b
update gitignore 2017-08-06 16:52:46 -04:00
Jack Robison
3a7e7adfe3 bump version to 0.12.0.4 2017-04-13 18:43:48 -04:00
Jack Robison
2b1d07fee4 Merge pull request #60 from lbryio/include-claimid-in-getclaimsintrie 
include the claimid in the response for getclaimsintrie
 2017-04-13 18:38:26 -04:00
Jack Robison
dd8638dba8 include the claimid in the response for getclaimsintrie 2017-04-13 15:10:22 -04:00
Alex Grintsvayg
4ec3516045 bump version to 0.12.0.3 2017-04-03 17:27:03 -04:00
Jack Robison
5913a70f7e Merge pull request #58 from lbryio/add-claimid-to-getvalueforname 
add claimId to return from getvalueforname
 2017-03-22 21:12:10 -04:00
Jack Robison
e6629319a5 add claimId to return from getvalueforname 2017-03-22 15:06:20 -04:00
Kay Kurokawa
4a8e372720 bump version to 12.0.1.2 2017-02-01 11:16:28 -05:00
Umpei Kay Kurokawa
1b896ae75b Merge pull request #56 from lbryio/change_block_decrements 
Change max block decrement amount to 50
 2017-01-13 10:35:23 -05:00
Umpei Kay Kurokawa
ffad0154c1 Merge pull request #55 from lbryio/new_effective_amount 
Adding effective amount function to CClaimTrie
 2017-01-11 13:46:33 -05:00
Kay Kurokawa
61664b027b change max block decrement amount to 50 2017-01-04 17:52:07 -05:00
Kay Kurokawa
86592934cb Adding effective amount function to CClaimTrie 2017-01-04 13:57:28 -05:00
Umpei Kay Kurokawa
6542b53b36 Merge pull request #53 from kaykurokawa/fix_removesupport_bug_2 
Fix remove support bug
 2016-11-10 20:18:10 -05:00
Umpei Kay Kurokawa
e20f6785ad Merge pull request #52 from kaykurokawa/claimtrie_branching_tests 
Claimtrie branching tests with test for remove suppport bug
 2016-11-10 20:17:37 -05:00
kkurokawa
51d6b690cb fixing removesupport bug 2016-11-10 20:15:23 -05:00
kkurokawa
03b3828a65 adding test to check for spend of support where i in of txin[i] is not 0 2016-11-01 15:46:32 -04:00
kkurokawa
34f61bbbf0 adding new claimtrie branching tests 2016-10-28 14:28:11 -04:00
Umpei Kay Kurokawa
cddeccd2b9 Merge pull request #50 from kaykurokawa/add_claimscript_encode 
Adding claimtrie script generation functions
 2016-10-28 12:26:43 -04:00
Umpei Kay Kurokawa
af860d89cf Merge pull request #49 from kaykurokawa/set_release_true 
Set client version as release
 2016-10-27 11:06:18 -04:00
kkurokawa
65505b3d55 Adding claimtrie script generation functions 2016-10-27 11:02:21 -04:00
kkurokawa
b6d9e4e591 setting client version as release 2016-10-26 11:32:02 -04:00
Job Evers‐Meltzer
b89ff5f456 Merge pull request #34 from kaykurokawa/check_dust 
Re-enable dust threshold checks
 2016-10-18 11:27:20 -05:00
Alex Grintsvayg
f288fac940 Bump version: 0.3.15 → 0.3.16 2016-10-13 16:07:25 -04:00
Alex Grintsvayg
7308f24663 get bumpversion back on track 2016-10-13 16:07:17 -04:00
Alex Grin
5a83924245 Merge pull request #47 from lbryio/new_seed_nodes 
update fixed seed nodes
 2016-10-13 16:05:28 -04:00
Alex Grintsvayg
df5f764d52 add testnet dns seeds 2016-10-13 15:46:14 -04:00
Alex Grintsvayg
c8199b158d update fixed seed nodes 2016-10-12 20:25:21 -04:00
Alex Grintsvayg
270307a290 license 2016-09-13 22:10:35 -04:00
James Kiselak
0d0d7c5320 Merge pull request #37 from kaykurokawa/bump_version 
update version
 2016-08-26 18:38:25 -04:00
Alex Grintsvayg
e7eaf46f3c bumpversion 2016-08-25 19:14:44 -04:00
James Kiselak
fa505b789a Merge pull request #38 from kaykurokawa/new_basic_tests 
New basic tests
 2016-08-17 21:09:47 -04:00
kkurokawa
1b80858a44 adding test to check the POW algorithm 2016-08-10 21:04:04 -04:00
kkurokawa
e0089d19f2 adding test for block with bogus claim trie hash 2016-08-10 16:45:36 -04:00
kkurokawa
50c2ed0fee lowering dust threshold to 1 , in order to not break lbrynet 2016-08-08 20:49:40 -04:00
kkurokawa
e4481fc213 update version 2016-08-08 19:12:30 -04:00
Job Evers-Meltzer
083a4a1b88 Change build timeout to 40 minutes 2016-08-08 10:58:58 -05:00
Job Evers-Meltzer
cbb6acd75c travis fix: only output last 1000 lines on error 2016-08-08 10:02:46 -05:00
kkurokawa
b51444fd5c Re-enable dust threshold checks 2016-08-07 18:58:14 -04:00
Jack Robison
774246d16f Merge pull request #15 from jimmykiselak/claimid_rpc_updates 
Claimid rpc updates
 2016-08-06 21:25:33 -04:00
Job Evers‐Meltzer
3e26b5f342 Merge pull request #31 from lbryio/build-windows 
add windows build to travis
 2016-08-03 14:58:25 -05:00
James Kiselak
93eb2e3c47 Merge pull request #1 from kaykurokawa/claimid_rpc_updates_fix 
patch for https://github.com/lbryio/lbrycrd/pull/15
 2016-08-01 21:47:25 -04:00
kkurokawa
ec3801f07a fixing listclaimnames not showing supports, updating help messages for rpc commands 2016-08-01 21:31:20 -04:00
Job Evers
2df151e325 add windows build to travis 
Compiles lbrycrdd using mingw to produce a windows executable
 2016-07-29 15:12:46 -05:00
Jeremy Kauffman
c3e9266494 Merge pull request #30 from kaykurokawa/update_rpc_getvalueforname 
adding effective amount to rpc command getvalueforname
 2016-07-29 09:31:24 -04:00
kkurokawa
526b1866ee adding effective amount to rpc command getvalueforname 2016-07-28 18:14:14 -04:00
Jeremy Kauffman
d0214d14c5 Merge pull request #14 from jimmykiselak/bogus_claimid_tests 
Bogus claimid tests
 2016-07-27 18:35:31 -04:00
Alex Grin
a5dc212ef5 Merge pull request #24 from tpruvot/rpc 
rpc: add claimtrie field in getblocktemplate
 2016-07-25 12:30:18 -04:00
Tanguy Pruvot
ce7f414962 rpc: add claimtrie field in getblocktemplate 
getblocktemplate is supposed to output all required mining infos
 2016-07-21 22:01:47 +02:00
Jeremy Kauffman
874948ec59 Merge pull request #23 from kaykurokawa/max_name_length_fix 
Limits name length of claimtrie transactions to 255 bytes
 2016-07-21 15:25:40 -04:00
kkurokawa
ad7304e321 Limits name length of claimtrie transactions to 255 bytes 2016-07-21 14:58:49 -04:00
Jimmy Kiselak
a186aaa073 put useful documentation, also report the last takeover height 2016-07-18 23:29:41 -04:00
Jimmy Kiselak
80bb42c912 make getclaimsforname show useful info and group together supports 2016-07-18 22:37:30 -04:00
Job Evers‐Meltzer
cf2d87a3ba Merge pull request #19 from lbryio/better-log 
Better logging on travis builds
 2016-07-15 22:09:46 -05:00
Job Evers-Meltzer
5fb9f4cba6 misc fixes 2016-07-15 20:59:20 -05:00
Job Evers-Meltzer
3495c9a5b4 output log file when lbrycrd build fails 2016-07-15 19:13:53 -05:00
Job Evers-Meltzer
134a1f48f9 only brew if not already installed 
Sometimes brew only warns, but other times it errors
if you're installing something that is already installed, so
lets be safe and only brew if its not already installed
 2016-07-15 16:12:16 -05:00
Job Evers‐Meltzer
62c1bcb345 Merge pull request #18 from lbryio/osx-release 
release the OSX binaries on tag too
 2016-07-15 15:44:21 -05:00
Job Evers-Meltzer
297fc02c4e release the OSX binaries on tag too 2016-07-15 15:15:09 -05:00
Jimmy Kiselak
e713501a5d start making getclaimsforname rpc command 2016-07-14 23:11:31 -04:00
Job Evers‐Meltzer
783f5fd7cd Merge pull request #17 from lbryio/build-osx-squash 
Add osx build to travis
 2016-07-14 11:42:08 -05:00
Job Evers-Meltzer
fa2b8b6eff download dependencies from lbrycrd-dependencies repo 2016-07-14 11:41:21 -05:00
Job Evers-Meltzer
5b113e524c Add osx build to travis 
This is a large commit.  Travis has some limitations that
the OSX build runs into so a few things needed to change:

- travis has a 4mb log limit
    - log stdout/stderr to log files
    - cat relevant log file if there is a build issue
- travis will kill the job if it is silent for ten minutes
    - echo messages every minute
- travis has a 50 minute job limit
    - add caching for dependencies
    - proactively abort a build after 45 minutes to ensure the
        cache will be populated

Caching creates its own set of problems so the ability to clear the
dependency folder was added and each dependency will delete its folder
if something goes wrong during the build of that dependency. This
prevents future runs from thinking a dependency has been cached when
it actually hasn't.

The build files for OSX and linux were unified into one script.
 2016-07-14 11:41:21 -05:00
Job Evers‐Meltzer
786e9e13c3 Merge pull request #11 from lbryio/add-linux-release 
zip binaries and deploy to github
 2016-07-12 14:38:56 -05:00
Job Evers
d3e84c51b7 zip linux binaries and deploy to github 2016-07-12 14:35:10 -05:00
Jimmy Kiselak
0551e881f5 fix supports and fix printing of claimid and value for updates 2016-07-11 23:37:17 -04:00
Job Evers‐Meltzer
b4437941a3 Merge pull request #13 from jimmykiselak/master 
make regtest generate blocks faster so that tests run in a reasonable amount of time
 2016-07-11 12:27:58 -05:00
Job Evers-Meltzer
e48c63ae51 temporarily create and cache a release directory 
I need to debug a deployment issue and that is a pain
when the build takes 40 minutes. Caching the final result
so that I can quickly try deploying.

Will undo this change when the deployment issue is resolved.
 2016-07-11 10:51:48 -05:00
Jimmy Kiselak
31008a84b2 begin updating wallet rpc to use claimids 2016-07-11 00:08:01 -04:00
Jimmy Kiselak
b6e686538f add tests that verify updates with bogus claimids never make it into the trie 2016-07-11 00:07:04 -04:00
Jimmy Kiselak
40735d9e8f make regtest generate blocks faster so that tests run in a reasonable amount of time 2016-07-10 22:25:24 -04:00
Jeremy Kauffman
d4f0689bd7 Merge pull request #12 from lbryio/get-hashes-per-sec 
Resurrect gethashespersec
 2016-07-08 16:42:58 -04:00
jonaswhidden
bea0d27432 Resurrect gethashespersec 2016-07-08 02:57:29 -05:00
Jack Robison
5099979bb8 Merge pull request #9 from kaykurokawa/master 
Updating chainparams, adding checkpoint at block 4000 to mainnet, fix…
 2016-07-01 20:31:07 -04:00
Jack Robison
91ec2b7bbc Merge pull request #8 from lbryio/build-on-travis 
Run reproducible build script on Travis
 2016-07-01 20:28:50 -04:00
kkurokawa
88c28a7fd6 Updating chainparams, adding checkpoint at block 4000 to mainnet, fixing broken tests 2016-07-01 15:06:28 -04:00
Job Evers
981b8e5947 Modify reproducible build script 
- fixes type on last line
- works on a fresh ubuntu docker container
- will hopefully work on travis too
 2016-07-01 01:02:29 -05:00
Jack Robison
fb4f703712 use master branch 2016-06-29 17:08:26 -04:00
Jack
c68dd16f23 Merge remote-tracking branch 'origin/master' 2016-06-29 17:02:09 -04:00
Jack
aacc766bf6 update lbrycrd master to real blockchain 2016-06-29 16:58:14 -04:00
Jack
da53f17a28 t push origin masterMerge branch 'real2' 
update lbrycrd master to real blockchain
 2016-06-29 16:47:16 -04:00
Jack
40dfbfd0f4 Merge branch 'master' into real2 2016-06-29 16:46:40 -04:00
Jack
546edc04db os x build script 2016-06-22 15:08:45 -04:00
Jack
4d4e693788 merge realnewpow2 2016-06-22 10:04:22 -04:00
kkurokawa
131006b10d Switching to digishield difficulty retargeting algorithm 
merge from kaykurokawa/lbrycrd
 2016-06-20 17:34:02 -04:00
Jimmy Kiselak
e0a08c220d Merge branch 'withjackscommits' into real2 2016-06-18 15:28:27 -04:00
Jimmy Kiselak
7e3d0d9f8f Merge branch 'withjackscommits' into realnewpow2 2016-06-18 09:21:29 -04:00
Jack
ed381288f1 register mining commands 2016-06-18 09:20:26 -04:00
Jack
e8212f3eb7 add more dns seeds 2016-06-18 09:20:26 -04:00
Jack
ae72d636db merge claimtrie-commands 2016-06-18 09:20:26 -04:00
Jack Robison
34d3d467b5 checkout real branch and don't build for generic32 2016-06-18 09:20:26 -04:00
Jack Robison
b4e19e9ca4 add testnet node 2016-06-18 09:20:26 -04:00
Jack Robison
cada713b1d update node ip 2016-06-18 09:20:26 -04:00
Jack Robison
6fc0a906d3 update seeds 2016-06-18 09:20:26 -04:00
Jack Robison
20d80ef90c add libevent 2016-06-18 09:20:26 -04:00
Jimmy Kiselak
c09b81d37e new PoW hash function 2016-06-17 22:44:51 -04:00
Jimmy Kiselak
864533c699 use PoW hash in test_bitcoin, use pound defs for generating genesis block 2016-06-17 22:34:48 -04:00
Jack Robison
9b0f70ccba fix variable name 2016-06-07 18:44:24 -04:00
Jimmy Kiselak
e190551cb2 put chain params in pound defs 2016-06-06 22:16:04 -04:00
Jimmy Kiselak
e08d765f11 Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge 
Conflicts:
	Makefile.am
	README.md
	configure.ac
	contrib/seeds/nodes_main.txt
	qa/rpc-tests/decodescript.py
	qa/rpc-tests/test_framework/util.py
	src/Makefile.am
	src/Makefile.qt.include
	src/Makefile.qttest.include
	src/Makefile.test.include
	src/bitcoin-cli-res.rc
	src/bitcoin-cli.cpp
	src/bitcoin-tx.cpp
	src/bitcoind.cpp
	src/chainparams.cpp
	src/chainparamsseeds.h
	src/init.cpp
	src/main.cpp
	src/main.h
	src/miner.cpp
	src/net.cpp
	src/primitives/block.cpp
	src/rpc/mining.cpp
	src/rpc/rawtransaction.cpp
	src/rpc/server.cpp
	src/rpcserver.h
	src/script/interpreter.cpp
	src/script/script.cpp
	src/script/script.h
	src/test/alert_tests.cpp
	src/test/data/alertTests.raw
	src/test/data/script_invalid.json
	src/test/data/script_valid.json
	src/test/data/tx_invalid.json
	src/test/data/tx_valid.json
	src/test/miner_tests.cpp
	src/test/script_tests.cpp
	src/test/test_bitcoin.cpp
	src/test/test_bitcoin.h
	src/test/transaction_tests.cpp
	src/timedata.cpp
	src/util.cpp
	src/wallet/rpcwallet.cpp
	src/wallet/wallet.cpp
	src/wallet/wallet.h
 2016-05-15 22:16:56 -04:00
Jimmy Kiselak
a78dfae04f get tests passing for new block rewards, change initial reward to 400M 2016-04-16 18:42:11 -04:00
Jeremy Kauffman
76b40a0ab4 ramp up block rewards during test window 2016-04-16 14:59:29 -04:00
Jimmy Kiselak
3b5a316c64 include claimtriehash in rpc call for block header 2016-04-16 14:50:22 -04:00
Jimmy Kiselak
f2ebd4bcd4 fix address prefix tests and change difficulty readjustment interval 2016-04-16 02:16:32 -04:00
Jimmy Kiselak
0c6e9d1eca change address prefixes 2016-04-14 22:02:44 -04:00
Jimmy Kiselak
8bea2e7ad3 increase block size to 2 million bytes 2016-04-12 21:51:15 -04:00
Jimmy Kiselak
c775a2f8b4 bump up limit on maximum script element size 2016-04-11 22:31:26 -04:00
Jimmy Kiselak
60ddd1b89b limit claim script sizes to 2^13 bytes 2016-04-11 20:48:16 -04:00
Jimmy Kiselak
df370a367f switch to dedicated PoW hash function for CheckProofOfWork 2016-04-01 21:37:44 -04:00
Jimmy Kiselak
dfa15c9df1 change Bitcoin to LBRYcrd in some messages, and reduce the initial reward to 350,000,000 LBC 2016-03-29 21:40:58 -04:00
Jimmy Kiselak
f56d092046 Merge remote-tracking branch 'github/changealertkey' into real 
Conflicts:
	src/chainparams.cpp
 2016-03-12 00:14:57 -05:00
Jimmy Kiselak
fa00101b11 Merge branch 'changealertkey' 2016-03-12 00:10:04 -05:00
Jimmy Kiselak
5ceed8b0f4 change the alert key and update tests to reflect the new key 2016-03-12 00:08:51 -05:00
Jimmy Kiselak
3a09c19691 Merge remote-tracking branch 'github/fulltrierpc' into real 
Conflicts:
	src/rpcclaimtrie.cpp
 2016-03-11 13:06:35 -05:00
Jimmy Kiselak
17e4f632e2 Merge remote-tracking branch 'github/fulltrierpc' into real 
Conflicts:
	src/rpcclaimtrie.cpp
	src/rpcserver.cpp
	src/rpcserver.h
 2016-03-11 13:00:36 -05:00
Jimmy Kiselak
0b51e7305e Merge branch 'fulltrierpc' 2016-03-11 12:59:13 -05:00
Jimmy Kiselak
725996f21f make sure the correct values get returned by getclaimsintrie 2016-03-11 12:59:00 -05:00
Jimmy Kiselak
bedfd6cea2 Merge branch 'fulltrierpc' 2016-03-11 00:06:59 -05:00
Jimmy Kiselak
f4d5f23486 create an rpc command to return all claims in the trie 2016-03-11 00:01:30 -05:00
Jimmy Kiselak
7143199c4a Merge branch 'master' of git.jimmykiselak.com:/usr/git/ncc into real 2016-02-18 18:30:33 -05:00
Jimmy Kiselak
a6984a9d72 get rid of dust transactions for now 2016-02-18 18:29:46 -05:00
Jimmy Kiselak
7b866aa51e Merge in proofs, and fix two delay related bugs 
Bug #1: If a claim was inserted for name which had no previous
claims, it would be treated as if it had been under
continuous ownership since block 0

Bug #2: When disconnecting and connecting blocks, the official
trie was checked to see if changes of ownership took place,
which could result in the wrong answer if a single cache was
used to disconnect/connect multiple blocks without flushing
to the trie

Merge branch 'master' of git.jimmykiselak.com:/usr/git/ncc into real

Conflicts:
	src/ncctrie.cpp
	src/ncctrie.h
	src/rpcserver.cpp
	src/test/ncctrie_tests.cpp
 2016-02-10 19:44:39 -05:00
Jimmy Kiselak
7d14e09e5d remove all recursion from generating/verifying name proofs 2016-02-06 00:17:57 -05:00
Jimmy Kiselak
ab830e84a3 make getting a proof an rpc call 2016-02-04 19:55:01 -05:00
Jimmy Kiselak
ff6459a9bb Merge branch 'master' of github.com:lbryio/lbrycrd 2016-02-02 00:29:21 -05:00
Jimmy Kiselak
6a572c8307 enable creating proofs for the claim trie 2016-02-02 00:28:57 -05:00
Jimmy Kiselak
64c8f22d4c Merge branch 'master' into real 2016-01-30 14:36:29 -05:00
Jimmy Kiselak
ba692d57f1 remove executable permission on reproducable-build 2016-01-30 14:35:33 -05:00
Jimmy Kiselak
55c203fada Merge branch 'master' into real 2016-01-30 14:34:26 -05:00
Jimmy Kiselak
1f438bd9f6 put LBRYcrd in README, and add instructions for building an exact copy of the official binaries 2016-01-30 14:30:13 -05:00
Jimmy Kiselak
36cc463670 merge in master 2016-01-28 18:34:07 -05:00
Jimmy Kiselak
5a170adab8 change type of expiration queue 2016-01-04 19:04:55 -05:00
Jimmy Kiselak
1f9a22d62e change type for support queue and type stored in block undo for claim insertions 2015-12-31 02:51:09 -05:00
Jimmy Kiselak
4beb23eb2f change type stored in block undo for claim insertions 2015-12-30 14:30:43 -05:00
Jimmy Kiselak
76d4b51843 reorder operations in decrementBlock 2015-12-29 16:36:06 -05:00
Jimmy Kiselak
4d3c19e626 change type in claim queue 2015-12-29 16:21:09 -05:00
Jimmy Kiselak
97f2067c66 make supports expire 2015-12-29 13:50:11 -05:00
Jimmy Kiselak
78871a7091 clean up claimtrie some, start working toward expiring supports 2015-12-23 14:12:32 -05:00
Jimmy Kiselak
06a9919b48 Create OP_UPDATE_CLAIM, make OP_SUPPORT_CLAIM refer to claimID 
Updates to claims now refer to a unique ID assigned to OP_CLAIM_NAMEs.
The claimID is the Hash160 of the claim's hash and nOut. When an
update is updated, that same claimID is used, so all updates to a
claim will use the original claimID.

Supports now refer to the claimID rather than a specific hash and
nOut.
 2015-12-22 19:11:50 -05:00
Jimmy Kiselak
7859b72ab4 add an upper limit to the delay between when a claim or support is made and when it becomes active 2015-12-17 12:05:20 -05:00
Jimmy Kiselak
f9dfe3d067 switch to only using proportional delay 2015-12-17 03:11:46 -05:00
Jimmy Kiselak
c759aebfab handle situation where expired claim is spent correctly 2015-12-09 23:37:16 -05:00
Jimmy Kiselak
c5b589c33d handle situation where expired claim is spent correctly 2015-12-09 15:16:13 -05:00
Jimmy Kiselak
50d78cfdba implement the proportional auction delay 2015-12-05 23:08:11 -05:00
Jimmy Kiselak
98ada76975 lay the ground work for a proportional auction delay 2015-12-05 23:08:11 -05:00
Jimmy Kiselak
bc2465f9aa change bitcoin to lbrycrd in binaries and default data directories 2015-12-05 23:08:07 -05:00
Jimmy Kiselak
76f24dffde change default peer address, fix crash in claim trie 2015-12-05 23:03:00 -05:00
Jimmy Kiselak
4873a2833b change the message start bytes 2015-11-18 17:52:20 -05:00
Jimmy Kiselak
a1c1d813ae change bitcoin to lbrycrd in binaries and default data directories 2015-11-12 13:54:46 -05:00
Jimmy Kiselak
65d2644f50 change default peer address, fix crash in claim trie 2015-11-04 00:00:01 -05:00
Jimmy Kiselak
ffdbecb287 change initial reward to 350000000, claimtrie_tests uses regtest 2015-10-29 23:27:50 -04:00
Jimmy Kiselak
bf45e835fb remove unnecessary non-const function, make other function const 2015-10-29 00:17:21 -04:00
Jimmy Kiselak
55207d9767 change subsidy formula and change initial block reward 2015-10-28 23:05:30 -04:00
Jimmy Kiselak
cda9f1f0ff extend getclaimsfortx to also handle supports 2015-10-27 22:14:04 -04:00
Jimmy Kiselak
3862e2f809 merge in rpc command for getting claims for transaction 2015-10-27 17:55:33 -04:00
Jimmy Kiselak
c1c83ddc1b create an rpc command for getting claims out of a transaction id 2015-10-27 16:37:09 -04:00
Jimmy Kiselak
d117a97a41 merge in combining getvalueforname and gettxidforname 2015-10-27 01:54:47 -04:00
Jimmy Kiselak
5b59877146 combine getvalueforname and gettxinfoforname 2015-10-26 15:51:10 -04:00
Jimmy Kiselak
7af9e6dc93 fix null pointer dereference 2015-10-21 23:35:30 -04:00
Jimmy Kiselak
f976d965c7 merge upstream changes, set up testnet and regtestnet 2015-10-21 22:30:56 -04:00
Jimmy Kiselak
a287dbfd65 fix how transactions are shown 2015-10-02 01:51:50 -04:00
Jimmy Kiselak
f0b2c46d68 change structure of claim supports, implement rpc commands for supports 2015-10-01 02:37:47 -04:00
Jimmy Kiselak
d66ea74521 finish tests for supporting claims 2015-09-29 21:03:02 -04:00
Jimmy Kiselak
b2b69b4e26 add more tests, refactor some 2015-09-29 02:51:44 -04:00
Jimmy Kiselak
3e85228387 add more tests for supports and one additional test for claims 2015-09-28 17:57:17 -04:00
Jimmy Kiselak
6557635e16 finish implementing supports in the claim trie 2015-09-27 18:24:46 -04:00
Jimmy Kiselak
2dcc6a989e start implementing supporting claims 2015-09-25 17:09:21 -04:00
Jimmy Kiselak
eb25177f5e do some rebranding and change default ports 2015-09-24 01:15:28 -04:00
Jimmy Kiselak
abbd4f64bf update op codes, start writing tests for OP_SUPPORT_CLAIM 2015-09-23 16:19:59 -04:00
Jimmy Kiselak
f6c1bab64e remove references to bitcoin in many user facing places 2015-09-23 01:23:40 -04:00
Jimmy Kiselak
6e5d851231 change 'Bitcoin server starting' to 'LBRYcrd server starting' 2015-08-26 11:21:32 -04:00
Jimmy Kiselak
243dd23818 fix bug where update to best claim doesnt take effect immediately if there are other claims on the name 2015-06-25 14:05:27 -04:00
Jimmy Kiselak
27f9a96030 change bitcoin.conf to lbrycrd.conf 2015-06-12 11:16:09 -04:00
Jimmy Kiselak
909303d4ec change executable names from bitcoin to lbrycrd 2015-06-12 10:48:04 -04:00
Jimmy Kiselak
d3df7747d7 change user-facing mention of ncc to lbrycrd/name, and move all UniValue out of ncctrie.cpp 2015-06-11 22:55:12 -04:00
Jimmy Kiselak
3d7b9221b5 merge in upstream changes 2015-06-11 17:20:54 -04:00
Jimmy Kiselak
13204c4cfa ensure unspending expired claims does not cause them to be reinserted into the trie 2015-05-27 18:59:38 -04:00
Jimmy Kiselak
30d123a70b enable expiration of claims after a certain number of blocks 2015-05-27 17:53:12 -04:00
Jimmy Kiselak
71a28f8d8f store ncc trie insertion queues on disk, so that eventually removal queues can be stored on disk the same way 2015-05-21 13:50:40 -04:00
Jimmy Kiselak
6bca5ead23 merge in changes from upstream 2015-05-20 10:26:14 -04:00
Jimmy Kiselak
c2b40f1df9 merge in changes from upstream 2015-04-30 12:22:51 -04:00
Jimmy Kiselak
dbf1afa6ff add target field to getblock rpc call, and convert ncc value returns to decimal 2015-04-14 22:16:16 -04:00
Jimmy Kiselak
49c7c3ef25 fix bug due to unitialized var in CTxInUndo, and create rpc calls for getting some statistics about the ncc trie 2015-04-10 16:50:50 -04:00
Jimmy Kiselak
c584a71a09 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-04-08 23:29:48 -04:00
Jimmy Kiselak
ba687afe81 make genesis coinbase spendable, and also increase minimum difficulty 2015-04-08 23:28:04 -04:00
Jimmy Kiselak
5b95c0d292 add a fixed seed node 2015-04-06 19:00:27 -04:00
Jimmy Kiselak
1c85278d3e merge bitcoin changes 2015-04-06 11:43:13 -04:00
Jimmy Kiselak
0e0fb4a056 hash txid and nOut in CNodeValue hash to make spoofing the value more difficult 2015-03-25 22:10:05 -04:00
Jimmy Kiselak
361c99b104 merge bitcoin changes 2015-03-25 14:06:04 -04:00
Jimmy Kiselak
c9785bb21f flush ncc trie to disk at the same time pcoins and pblocktree are flushed to disk, so that if the program crashes they are at the same block 2015-03-23 14:51:29 -04:00
Jimmy Kiselak
7813f3157b show depth, whether spent, and whether in ncc trie for listnameclaims 2015-03-19 17:16:35 -04:00
Jimmy Kiselak
c8834c5551 finish enabling delayed ncc trie claim insertions, and rewrite the test for the delays so that it uses the actual block processing system 2015-03-19 12:57:56 -04:00
Jimmy Kiselak
f2a7a5c401 delay insertion of claims into trie 2015-03-17 01:16:37 -04:00
Jimmy Kiselak
a1fca49174 fix bug where some new claims aren't written to the ncc trie on disk if they don't change the hash of their node 2015-03-08 20:24:13 -04:00
Jimmy Kiselak
746ffd13c8 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-02-23 17:52:07 -05:00
Jimmy Kiselak
bc266a1677 hash the value of a node before computing the hash of the node, to prevent a false value from being crafted which will result in the same node hash yet mask the existence of child nodes 2015-02-23 17:51:52 -05:00
Jimmy Kiselak
3e6efa8a2f fix typo in help string 2015-02-11 12:34:28 -05:00
Jimmy Kiselak
ccc1c22301 Remove old TODO 2015-02-10 20:14:54 -05:00
Jimmy Kiselak
6f9808faff add an rpc command for getting the value of a name 2015-02-10 18:44:14 -05:00
Jimmy Kiselak
b68b97388e Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-02-10 16:21:34 -05:00
Jimmy Kiselak
e7654b8703 add best block hash to ncc trie, and remove possibility of a null base to ncc cache 
ensure the ncc trie and any caches are always in sync with the current best block
by informing the trie when the block changes, and have the ncc trie persist that
in the database. check against that whenever modifying the trie.

get rid of the possibility of a CNCCTrieCache having a null base, and create a
CNCCTrie in test_bitcoin.cpp so one exists during testing.
 2015-02-10 15:30:40 -05:00
Jimmy Kiselak
389a2a963e fix a few bugs and add some assertions 
ncctrietests.cpp:
add test to make sure emptying the ncc trie cache results in a
default hash ("00...01")
ncctrie.cpp:
fix the ncc trie cache so that emptying it causes the root hash
to be computed as the default hash ("00...01")
fix two bugs in reading the ncc trie from disk:
all insertions were returning immediately due to parenthesis
misplacement, and the loop reading nodes from disk wasn't
terminating due to a lack of an incrementing operation
miner.cpp
fix a bug in the miner where input coins in the cache were being
spent before their txouts could be checked for NCC commands
main.cpp
add some assertions when disconnecting blocks from the active
chain, ensuring the merkle root of the ncc trie after undoing the
block is equal to the hashNCCTrie in the previous block
fix an erroneous assertion in ConnectBlock to assert the correct
expected value
change some log statements to use __func__
init.cpp
change the order of some init operations so the NCC trie is
restored from disk before the DB is verified
 2015-02-10 11:19:41 -05:00
Jimmy Kiselak
df59145787 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/main.cpp

merge in bitcoin changes. conflict in src/main.cc, where
applying tx undos was separated into its own function.
 2015-02-09 10:26:35 -05:00
Jimmy Kiselak
79be562ff2 rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 
create an rpc command to print the whole ncc trie
create an rpc command to search get transaction info
for a particular name
change the number of bytes in the header expected by miner.cpp
make sure the ncc merkle hash is copied to all structures that
need it
 2015-02-07 12:32:05 -05:00
Jimmy Kiselak
cd3f33c1fc merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
Jimmy Kiselak
b2b0bd5bb5 implement reading and writing the NCC trie to disk, create the global trie upon initialization, add and remove NCC claims when connecting and disconnecting blocks, and check block headers against the NCC merkle hash 2015-02-05 14:24:09 -05:00
Jimmy Kiselak
9bb4ecef2a move everything trie related into its own file, enable serialization of trie nodes and values, and create some tests for serialization 2015-02-02 20:57:53 -05:00
Jimmy Kiselak
e503dbe836 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-01-30 10:10:52 -05:00
Jimmy Kiselak
fd35060a6f create the NCC trie, which holds name claims, and create a test for it 2015-01-30 10:10:36 -05:00
Jimmy Kiselak
5be46df3ed enable limiting output of listnameclaims to transactions which have a minimum number of confirmations 2015-01-15 18:02:30 -05:00
Jimmy Kiselak
fbd0b07497 Add tests which make sure an NCC txout can be created, spent to another NCC txout, and spent to a non-NCC txout 2015-01-15 16:59:54 -05:00
Jimmy Kiselak
a50a5ad369 merge in bitcoin changes 2015-01-15 12:52:38 -05:00
Jimmy Kiselak
1431b9e03c Enable spending NCC transactions (both updating and abandoning their claims), and enable printing them out with their info 2015-01-14 19:17:19 -05:00
Jimmy Kiselak
9a9273ebc6 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/chainparams.cpp
	src/coins.cpp
	src/main.h
	src/test/Checkpoints_tests.cpp
 2015-01-05 12:17:58 -05:00
Jimmy Kiselak
d4d3ab8115 create functions in main.cpp which can decode and strip NCC commands from a txout.scriptPubKey, and create functions in rpcwallet.cpp which can create transactions with NCC commands. change tests to pass given NCC parameters, add CLAIM_NAME as a script command in script/script.h, and add a few printouts that occur during transaction spends which should be removed later 2015-01-05 11:43:07 -05:00
Jimmy Kiselak
aec93c1245 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/qt/networkstyle.cpp
 2014-12-16 11:33:37 -05:00
Jimmy Kiselak
4fc3834cdd Merge branch 'master' of https://github.com/bitcoin/bitcoin 2014-12-08 17:43:24 -05:00
Jimmy Kiselak
a001f51045 separate from the main network 2014-12-08 17:43:18 -05:00