Skip to content

Commit f084479

Browse files
committed
Merge #521: [0.17] Change branding from bitcoin to elements
d1f5351 Update man pages (Steven Roose) e1cd00c Change branding from bitcoin to elements (Steven Roose) ade539c Don't assume mainchain is Bitcoin (Steven Roose) cf77a23 Update README to Elements Project (Steven Roose) Pull request description: Tree-SHA512: f9428219b15a52fd6cff63e7a725a4cb67a3dbecf59eaf7ca946a2b1af8b803bd75c3a62f1feacc8356ae21d32b308cafb27a254d52db6a462563a82b271e101
2 parents 753a1ce + d1f5351 commit f084479

Some content is hidden

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

48 files changed

+754
-342
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
*.tar.gz
22

33
*.exe
4-
src/bitcoin
5-
src/bitcoind
6-
src/bitcoin-cli
7-
src/bitcoin-tx
4+
src/elements
5+
src/elementsd
6+
src/elements-cli
7+
src/elements-tx
88
src/test/test_bitcoin
99
src/test/test_bitcoin_fuzzy
1010
src/qt/test/test_bitcoin-qt

.travis/lint_06_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test/lint/check-doc.py
1818
test/lint/check-rpc-mappings.py .
1919
test/lint/lint-all.sh
2020

21-
if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
21+
if [ "$TRAVIS_REPO_SLUG" = "ElementsProject/elements" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
2222
while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
2323
travis_wait 50 contrib/verify-commits/verify-commits.py;
2424
fi

.travis/test_05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
DOCKER_EXEC echo \> \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file
9+
DOCKER_EXEC echo \> \$HOME/.elements # Make sure default datadir does not exist and is never read by creating a dummy file
1010

1111
mkdir -p depends/SDKs depends/sdk-sources
1212

.travis/test_06_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BEGIN_FOLD distdir
3434
DOCKER_EXEC make distdir VERSION=$HOST
3535
END_FOLD
3636

37-
cd "bitcoin-$HOST" || (echo "could not enter distdir bitcoin-$HOST"; exit 1)
37+
cd "elements-$HOST" || (echo "could not enter distdir elemenst-$HOST"; exit 1)
3838

3939
BEGIN_FOLD configure
4040
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)

README.md

Lines changed: 47 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,65 @@
1-
Bitcoin Core integration/staging tree
2-
=====================================
1+
Elements Project blockchain platform
2+
====================================
33

4-
[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)
4+
[![Build Status](https://travis-ci.org/ElementsProject/elements.svg?branch=master)](https://travis-ci.org/ElementsProject/elements)
55

6-
https://bitcoincore.org
6+
https://elementsproject.org
77

8-
What is Bitcoin?
9-
----------------
10-
11-
Bitcoin is an experimental digital currency that enables instant payments to
12-
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
13-
with no central authority: managing transactions and issuing money are carried
14-
out collectively by the network. Bitcoin Core is the name of open source
15-
software which enables the use of this currency.
8+
This is the integration and staging tree for the Elements blockchain platform,
9+
a collection of feature experiments and extensions to the Bitcoin protocol.
10+
This platform enables anyone to build their own businesses or networks
11+
pegged to Bitcoin as a sidechain or run as a standalone blockchain with arbitrary asset tokens.
1612

17-
For more information, as well as an immediately useable, binary version of
18-
the Bitcoin Core software, see https://bitcoincore.org/en/download/, or read the
19-
[original whitepaper](https://bitcoincore.org/bitcoin.pdf).
13+
Confidential Assets
14+
----------------
15+
The latest feature in the Elements blockchain platform is Confidential Assets,
16+
the ability to issue multiple assets on a blockchain where asset identifiers
17+
and amounts are blinded yet auditable through the use of applied cryptography.
2018

21-
License
22-
-------
19+
* [Announcement of Confidential Assets](https://blockstream.com/2017/04/03/blockstream-releases-elements-confidential-assets.html)
20+
* [Confidential Assets Whitepaper](https://blockstream.com/bitcoin17-final41.pdf) to be presented [April 7th at Financial Cryptography 2017](http://fc17.ifca.ai/bitcoin/schedule.html) in Malta
21+
* [Confidential Assets Tutorial](contrib/assets_tutorial/assets_tutorial.sh)
22+
* [Confidential Assets Demo](https://github.com/ElementsProject/confidential-assets-demo)
23+
* [Elements Code Tutorial](https://elementsproject.org/elements-code-tutorial/overview) covering blockchain configuration and how to use the main features.
2324

24-
Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
25-
information or see https://opensource.org/licenses/MIT.
25+
Features of the Elements blockchain platform
26+
----------------
2627

27-
Development Process
28-
-------------------
28+
Compared to Bitcoin itself, it adds the following features:
29+
* [Confidential Assets][asset-issuance]
30+
* [Confidential Transactions][confidential-transactions]
31+
* [Federated Two-Way Peg][federated-peg]
32+
* [Signed Blocks][signed-blocks]
33+
* [Additional opcodes][opcodes]
2934

30-
The `master` branch is regularly built and tested, but is not guaranteed to be
31-
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
32-
regularly to indicate new official, stable release versions of Bitcoin Core.
35+
Previous elements that have been integrated into Bitcoin:
36+
* Segregated Witness
37+
* Relative Lock Time
3338

34-
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
39+
Elements deferred for additional research and standardization:
40+
* [Schnorr Signatures][schnorr-signatures]
3541

36-
Testing
42+
License
3743
-------
44+
Elements is released under the terms of the MIT license. See [COPYING](COPYING) for more
45+
information or see http://opensource.org/licenses/MIT.
3846

39-
Testing and code review is the bottleneck for development; we get more pull
40-
requests than we can review and test on short notice. Please be patient and help out by testing
41-
other people's pull requests, and remember this is a security-critical project where any mistake might cost people
42-
lots of money.
43-
44-
### Automated Testing
47+
[confidential-transactions]: https://elementsproject.org/features/confidential-transactions
48+
[opcodes]: https://elementsproject.org/features/opcodes
49+
[federated-peg]: https://elementsproject.org/features#federatedpeg
50+
[signed-blocks]: https://elementsproject.org/features#signedblocks
51+
[asset-issuance]: https://elementsproject.org/features/issued-assets
52+
[schnorr-signatures]: https://elementsproject.org/features/schnorr-signatures
4553

46-
Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to
47-
submit new unit tests for old code. Unit tests can be compiled and run
48-
(assuming they weren't disabled in configure) with: `make check`. Further details on running
49-
and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).
54+
What is the Elements Project?
55+
-----------------
56+
Elements is an open source, sidechain-capable blockchain platform. It also allows experiments to more rapidly bring technical innovation to the Bitcoin ecosystem.
5057

51-
There are also [regression and integration tests](/test), written
52-
in Python, that are run automatically on the build server.
53-
These tests can be run (if the [test dependencies](/test) are installed) with: `test/functional/test_runner.py`
58+
Learn more on the [Elements Project website](https://elementsproject.org)
5459

55-
The Travis CI system makes sure that every pull request is built for Windows, Linux, and macOS, and that unit/sanity tests are run automatically.
56-
57-
### Manual Quality Assurance (QA) Testing
58-
59-
Changes should be tested by somebody other than the developer who wrote the
60-
code. This is especially important for large or high-risk changes. It is useful
61-
to add a test plan to the pull request description if testing the changes is
62-
not straightforward.
63-
64-
Translations
65-
------------
66-
67-
Changes to translations as well as new translations can be submitted to
68-
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
69-
70-
Translations are periodically pulled from Transifex and merged into the git repository. See the
71-
[translation process](doc/translation_process.md) for details on how this works.
72-
73-
**Important**: We do not accept translation changes as GitHub pull requests because the next
74-
pull from Transifex would automatically overwrite them again.
75-
76-
Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators).
60+
https://github.com/ElementsProject/elementsproject.github.io
7761

7862
Secure Reporting
7963
------------------
80-
See [our vulnerability reporting guide](SECURITY.md)
64+
See [our vulnerability reporting guide](SECURITY.md)
65+

configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2018)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])
10-
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
11-
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
10+
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Elements Project]])
11+
AC_INIT([Elements Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/ElementsProject/elements/issues],[elements],[https://elementsproject.org/])
1212
AC_CONFIG_SRCDIR([src/validation.cpp])
1313
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
1414
AC_CONFIG_AUX_DIR([build-aux])
1515
AC_CONFIG_MACRO_DIR([build-aux/m4])
1616

17-
BITCOIN_DAEMON_NAME=bitcoind
17+
BITCOIN_DAEMON_NAME=elementsd
1818
BITCOIN_GUI_NAME=bitcoin-qt
19-
BITCOIN_CLI_NAME=bitcoin-cli
20-
BITCOIN_TX_NAME=bitcoin-tx
19+
BITCOIN_CLI_NAME=elements-cli
20+
BITCOIN_TX_NAME=elements-tx
2121

2222
dnl Unless the user specified ARFLAGS, force it to be cr
2323
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])

contrib/bitcoin-cli.bash-completion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ _bitcoin_cli() {
143143
;;
144144
esac
145145
} &&
146-
complete -F _bitcoin_cli bitcoin-cli
146+
complete -F _bitcoin_cli elements-cli
147147

148148
# Local variables:
149149
# mode: shell-script

contrib/bitcoin-tx.bash-completion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _bitcoin_tx() {
4646

4747
return 0
4848
} &&
49-
complete -F _bitcoin_tx bitcoin-tx
49+
complete -F _bitcoin_tx elements-tx
5050

5151
# Local variables:
5252
# mode: shell-script

contrib/bitcoind.bash-completion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ _bitcoind() {
4545
;;
4646
esac
4747
} &&
48-
complete -F _bitcoind bitcoind bitcoin-qt
48+
complete -F _bitcoind elementsd bitcoin-qt
4949

5050
# Local variables:
5151
# mode: shell-script

contrib/devtools/gen-manpages.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ BUILDDIR=${BUILDDIR:-$TOPDIR}
77
BINDIR=${BINDIR:-$BUILDDIR/src}
88
MANDIR=${MANDIR:-$TOPDIR/doc/man}
99

10-
BITCOIND=${BITCOIND:-$BINDIR/bitcoind}
11-
BITCOINCLI=${BITCOINCLI:-$BINDIR/bitcoin-cli}
12-
BITCOINTX=${BITCOINTX:-$BINDIR/bitcoin-tx}
10+
BITCOIND=${BITCOIND:-$BINDIR/elementsd}
11+
BITCOINCLI=${BITCOINCLI:-$BINDIR/elements-cli}
12+
BITCOINTX=${BITCOINTX:-$BINDIR/elements-tx}
1313
BITCOINQT=${BITCOINQT:-$BINDIR/qt/bitcoin-qt}
1414

1515
[ ! -x $BITCOIND ] && echo "$BITCOIND not found or not executable." && exit 1

0 commit comments

Comments
 (0)