Skip to content

Commit b1874b9

Browse files
author
Chris
committed
Rebuild 0.15.2.2 -> 0.9.8.1
1 parent c0144e4 commit b1874b9

File tree

1,623 files changed

+333858
-232042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,623 files changed

+333858
-232042
lines changed

.gitignore

+12-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ config.log
3030
config.status
3131
configure
3232
libtool
33-
src/config/bitcore-config.h
34-
src/config/bitcore-config.h.in
33+
src/config/bitcoin-config.h
34+
src/config/bitcoin-config.h.in
3535
src/config/stamp-h1
3636
share/setup.nsi
3737
share/qt/Info.plist
@@ -44,6 +44,12 @@ src/qt/forms/ui_*.h
4444

4545
src/qt/test/moc*.cpp
4646

47+
src/qt/bitcoin-qt.config
48+
src/qt/bitcoin-qt.creator
49+
src/qt/bitcoin-qt.creator.user
50+
src/qt/bitcoin-qt.files
51+
src/qt/bitcoin-qt.includes
52+
4753
.deps
4854
.dirstamp
4955
.libs
@@ -55,6 +61,7 @@ src/qt/test/moc*.cpp
5561
*.pyc
5662
*.o
5763
*.o-*
64+
*.patch
5865
*.a
5966
*.pb.cc
6067
*.pb.h
@@ -74,7 +81,8 @@ src/qt/test/moc*.cpp
7481
*.qm
7582
Makefile
7683
bitcore-qt
77-
BitCore-Qt.app
84+
FxTC-Qt.app
85+
background.tiff*
7886

7987
# Unit-tests
8088
Makefile.test
@@ -106,5 +114,5 @@ test/cache/*
106114

107115
/doc/doxygen/
108116

109-
libbitcoreconsensus.pc
117+
libbitcoinconsensus.pc
110118
contrib/devtools/split-debug.sh

.travis.yml

+131-89
Large diffs are not rendered by default.

CONTRIBUTING.md

+31-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Contributing to BitCore Core
1+
Contributing to BitCore
22
============================
33

4-
The BitCore Core project operates an open contributor model where anyone is
4+
The BitCore project operates an open contributor model where anyone is
55
welcome to contribute towards development in the form of peer review, testing
66
and patches. This document explains the practical process and guidelines for
77
contributing.
@@ -14,7 +14,6 @@ purposes. As such there are repository "maintainers" who are responsible for
1414
merging pull requests as well as a "lead maintainer" who is responsible for the
1515
release cycle, overall merging, moderation and appointment of maintainers.
1616

17-
1817
Contributor Workflow
1918
--------------------
2019

@@ -24,9 +23,9 @@ facilitates social contribution, easy testing and peer review.
2423

2524
To contribute a patch, the workflow is as follows:
2625

27-
- Fork repository
28-
- Create topic branch
29-
- Commit patches
26+
1. Fork repository
27+
1. Create topic branch
28+
1. Commit patches
3029

3130
The project coding conventions in the [developer notes](doc/developer-notes.md)
3231
must be adhered to.
@@ -42,8 +41,8 @@ in init.cpp") in which case a single title line is sufficient. Commit messages s
4241
helpful to people reading your code in the future, so explain the reasoning for
4342
your decisions. Further explanation [here](http://chris.beams.io/posts/git-commit/).
4443

45-
If a particular commit references another issue, please add the reference, for
46-
example `refs #1234`, or `fixes #4321`. Using the `fixes` or `closes` keywords
44+
If a particular commit references another issue, please add the reference. For
45+
example: `refs #1234` or `fixes #4321`. Using the `fixes` or `closes` keywords
4746
will cause the corresponding issue to be closed when the pull request is merged.
4847

4948
Please refer to the [Git manual](https://git-scm.com/doc) for more information
@@ -81,7 +80,11 @@ Examples:
8180
Qt: Add feed bump button
8281
Trivial: Fix typo in init.cpp
8382

84-
If a pull request is specifically not to be considered for merging (yet) please
83+
Note that translations should not be submitted as pull requests, please see
84+
[Translation Process](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md)
85+
for more information on helping with translations.
86+
87+
If a pull request is not to be considered for merging (yet), please
8588
prefix the title with [WIP] or use [Tasks Lists](https://help.github.com/articles/basic-writing-and-formatting-syntax/#task-lists)
8689
in the body of the pull request to indicate tasks are pending.
8790

@@ -94,6 +97,8 @@ At this stage one should expect comments and review from other contributors. You
9497
can add more commits to your pull request by committing them locally and pushing
9598
to your fork until you have satisfied all feedback.
9699

100+
Note: Code review is a burdensome but important part of the development process, and as such, certain types of pull requests are rejected. In general, if the **improvements** do not warrant the **review effort** required, the PR has a high chance of being rejected. It is up to the PR author to convince the reviewers that the changes warrant the review effort, and if reviewers are "Concept NAK'ing" the PR, the author may need to present arguments and/or do research backing their suggested changes.
101+
97102
Squashing Commits
98103
---------------------------
99104
If your pull request is accepted for merging, you may be asked by a maintainer
@@ -102,10 +107,10 @@ before it will be merged. The basic squashing workflow is shown below.
102107

103108
git checkout your_branch_name
104109
git rebase -i HEAD~n
105-
# n is normally the number of commits in the pull
106-
# set commits from 'pick' to 'squash', save and quit
107-
# on the next screen, edit/refine commit messages
108-
# save and quit
110+
# n is normally the number of commits in the pull request.
111+
# Set commits (except the one in the first line) from 'pick' to 'squash', save and quit.
112+
# On the next screen, edit/refine commit messages.
113+
# Save and quit.
109114
git push -f # (force push to GitHub)
110115

111116
If you have problems with squashing (or other workflows with `git`), you can
@@ -153,14 +158,23 @@ behaviour of code within the pull request (bugs must be preserved as is).
153158
Project maintainers aim for a quick turnaround on refactoring pull requests, so
154159
where possible keep them short, uncomplex and easy to verify.
155160

161+
Pull requests that refactor the code should not be made by new contributors. It
162+
requires a certain level of experience to know where the code belongs to and to
163+
understand the full ramification (including rebase effort of open pull requests).
164+
165+
Trivial pull requests or pull requests that refactor the code with no clear
166+
benefits may be immediately closed by the maintainers to reduce unnecessary
167+
workload on reviewing.
168+
156169

157170
"Decision Making" Process
158171
-------------------------
159172

160-
The following applies to code changes to the BitCore Core project, and is not to be confused with overall BitCore
173+
The following applies to code changes to the BitCore project (and related
174+
projects such as libsecp256k1), and is not to be confused with overall BitCore
161175
Network Protocol consensus changes.
162176

163-
Whether a pull request is merged into BitCore Core rests with the project merge
177+
Whether a pull request is merged into BitCore rests with the project merge
164178
maintainers and ultimately the project lead.
165179

166180
Maintainers will take into consideration if a patch is in line with the general
@@ -173,7 +187,7 @@ In general, all pull requests must:
173187
the project (for example refactoring for modularisation);
174188
- Be well peer reviewed;
175189
- Have unit tests and functional tests where appropriate;
176-
- Follow code style guidelines;
190+
- Follow code style guidelines ([C++](doc/developer-notes.md), [functional tests](test/functional/README.md));
177191
- Not break the existing test suite;
178192
- Where bugs are fixed, where possible, there should be unit tests
179193
demonstrating the bug and also proving the fix. This helps prevent regression.
@@ -259,13 +273,10 @@ about:
259273
Release Policy
260274
--------------
261275

262-
The project leader is the release manager for each BitCore Core release.
276+
The project leader is the release manager for each BitCore release.
263277

264278
Copyright
265279
---------
266-
Copyright 2017 The BitCore Core Developers
267-
268-
- bitcore: Copyright (c) 2009-2017 Bitcoin Core Developers (MIT License)
269280

270281
By contributing to this repository, you agree to license your work under the
271282
MIT license unless specified otherwise in `contrib/debian/copyright` or at

COPYING

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017-2019 The Bitcore Core developers
3+
Copyright (c) 2009-2018 The Bitcoin Core developers
4+
Copyright (c) 2009-2018 Bitcoin Developers
5+
Copyright (c) 2018 FXTC developers
6+
Copyright (c) 2019 BitCore developers
47

58
Permission is hereby granted, free of charge, to any person obtaining a copy
69
of this software and associated documentation files (the "Software"), to deal

INSTALL.md

+1-11
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,4 @@ Building BitCore
22
================
33

44
See doc/build-*.md for instructions on building the various
5-
elements of the BitCore Core reference implementation of BitCore.
6-
7-
[build-openbsd.md](/doc/build-openbsd.md) OpenBSD build guide
8-
9-
[build-osx.md](/doc/build-osx.md) Mac OS X Build Instructions and Notes
10-
11-
[build-unix.md](/doc/build-unix.md) UNIX BUILD NOTES
12-
13-
[build-windows.md](/doc/build-winows.md) WINDOWS BUILD NOTES
14-
15-
5+
elements of the reference implementation of BitCore.

0 commit comments

Comments
 (0)