mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
Migrate project naming from "Beta" to "Elements"
Note: this also changes the CHAINPARAMS_ELEMENTS constant! The new network name is simply `elements`, and similarly regtest is now `elementsregtest`
This commit is contained in:
Eric Martindale
Gregory Sanders
parent
d4d6abbf6d
commit
bdfe5e2e25
50 changed files with 238 additions and 239 deletions
20
.gitignore
vendored
20
.gitignore
vendored
|
|
@ -1,13 +1,13 @@
|
|||
*.tar.gz
|
||||
|
||||
*.exe
|
||||
src/beta
|
||||
src/betad
|
||||
src/beta-cli
|
||||
src/beta-tx
|
||||
src/test/test_beta
|
||||
src/test/test_beta_fuzzy
|
||||
src/qt/test/test_beta-qt
|
||||
src/elements
|
||||
src/elementsd
|
||||
src/elements-cli
|
||||
src/elements-tx
|
||||
src/test/test_elements
|
||||
src/qt/test/test_elements-qt
|
||||
src/test/test_elements_fuzzy
|
||||
|
||||
# autoreconf
|
||||
Makefile.in
|
||||
|
|
@ -74,12 +74,12 @@ src/qt/test/moc*.cpp
|
|||
# Compilation and Qt preprocessor part
|
||||
*.qm
|
||||
Makefile
|
||||
beta-qt
|
||||
Beta-Qt.app
|
||||
elements-qt
|
||||
Elements-Qt.app
|
||||
|
||||
# Unit-tests
|
||||
Makefile.test
|
||||
beta-qt_test
|
||||
elements-qt_test
|
||||
src/test/buildenv.py
|
||||
|
||||
# Resources cpp
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
|
|||
$(MKDIR_P) $(@D)
|
||||
$(INSTALL_DATA) $< $@
|
||||
|
||||
$(OSX_APP)/Contents/MacOS/Beta-Qt: $(BITCOIN_QT_BIN)
|
||||
$(OSX_APP)/Contents/MacOS/Elements-Qt: $(BITCOIN_QT_BIN)
|
||||
$(MKDIR_P) $(@D)
|
||||
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
|
||||
|
||||
|
|
@ -105,7 +105,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
|
|||
|
||||
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
|
||||
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
|
||||
$(OSX_APP)/Contents/MacOS/Beta-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
|
||||
$(OSX_APP)/Contents/MacOS/Elements-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
|
||||
|
||||
osx_volname:
|
||||
echo $(OSX_VOLNAME) >$@
|
||||
|
|
@ -130,7 +130,7 @@ $(APP_DIST_DIR)/Applications:
|
|||
@rm -f $@
|
||||
@cd $(@D); $(LN_S) /Applications $(@F)
|
||||
|
||||
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Beta-Qt
|
||||
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Elements-Qt
|
||||
|
||||
$(OSX_DMG): $(APP_DIST_EXTRAS)
|
||||
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
|
||||
|
|
@ -145,7 +145,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
|
|||
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
|
||||
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"
|
||||
|
||||
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Beta-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
|
||||
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Elements-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
|
||||
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
|
||||
|
||||
deploydir: $(APP_DIST_EXTRAS)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 1)
|
|||
define(_CLIENT_VERSION_BUILD, 0)
|
||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||
define(_COPYRIGHT_YEAR, 2017)
|
||||
AC_INIT([Elements Beta],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_BUILD],[https://github.com/ElementsProject/elements/issues],[beta])
|
||||
AC_INIT([Elements Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION._CLIENT_VERSION_BUILD],[https://github.com/ElementsProject/elements/issues],[elements])
|
||||
AC_CONFIG_SRCDIR([src/validation.cpp])
|
||||
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Run the "uscan" command to check for upstream updates and more.
|
||||
version=3
|
||||
# use qa.debian.org redirector; see man uscan
|
||||
opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
|
||||
opts=uversionmangle=s/(\d)(alpha|beta|core|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
|
||||
http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ packages:
|
|||
- "python"
|
||||
remotes:
|
||||
- "url": "https://github.com/ElementsProject/elements.git"
|
||||
"dir": "beta"
|
||||
"dir": "elements"
|
||||
files: []
|
||||
script: |
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ script: |
|
|||
create_global_faketime_wrappers "2000-01-01 12:00:00"
|
||||
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
|
||||
export PATH=${WRAP_DIR}:${PATH}
|
||||
cd beta
|
||||
cd elements
|
||||
|
||||
EXTRA_INCLUDES_BASE=$WRAP_DIR/extra_includes
|
||||
mkdir -p $EXTRA_INCLUDES_BASE
|
||||
|
|
@ -135,13 +135,13 @@ script: |
|
|||
./autogen.sh
|
||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||
make dist
|
||||
SOURCEDIST=`echo beta-*.tar.gz`
|
||||
SOURCEDIST=`echo elements-*.tar.gz`
|
||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||
# Correct tar file order
|
||||
mkdir -p temp
|
||||
pushd temp
|
||||
tar xf ../$SOURCEDIST
|
||||
find beta-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||
popd
|
||||
|
||||
ORIGPATH="$PATH"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
name: "beta-dmg-signer"
|
||||
name: "elements-dmg-signer"
|
||||
suites:
|
||||
- "trusty"
|
||||
architectures:
|
||||
|
|
@ -11,7 +11,7 @@ remotes:
|
|||
- "url": "https://github.com/ElementsProject/gitian.sigs.ep.git"
|
||||
"dir": "signature"
|
||||
files:
|
||||
- "beta-osx-unsigned.tar.gz"
|
||||
- "elements-osx-unsigned.tar.gz"
|
||||
script: |
|
||||
WRAP_DIR=$HOME/wrapped
|
||||
mkdir -p ${WRAP_DIR}
|
||||
|
|
@ -28,11 +28,11 @@ script: |
|
|||
chmod +x ${WRAP_DIR}/${prog}
|
||||
done
|
||||
|
||||
UNSIGNED=beta-osx-unsigned.tar.gz
|
||||
SIGNED=beta-osx-signed.dmg
|
||||
UNSIGNED=elements-osx-unsigned.tar.gz
|
||||
SIGNED=elements-osx-signed.dmg
|
||||
|
||||
tar -xf ${UNSIGNED}
|
||||
OSX_VOLNAME="$(cat osx_volname)"
|
||||
./detached-sig-apply.sh ${UNSIGNED} signature/osx
|
||||
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Beta-Sidechain" -no-pad -r -apple -o uncompressed.dmg signed-app
|
||||
${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Elements-Sidechain" -no-pad -r -apple -o uncompressed.dmg signed-app
|
||||
${WRAP_DIR}/dmg dmg uncompressed.dmg ${OUTDIR}/${SIGNED}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ packages:
|
|||
- "fonts-tuffy"
|
||||
remotes:
|
||||
- "url": "https://github.com/ElementsProject/elements.git"
|
||||
"dir": "beta"
|
||||
"dir": "elements"
|
||||
files:
|
||||
- "MacOSX10.11.sdk.tar.gz"
|
||||
script: |
|
||||
|
|
@ -83,7 +83,7 @@ script: |
|
|||
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
|
||||
export PATH=${WRAP_DIR}:${PATH}
|
||||
|
||||
cd beta
|
||||
cd elements
|
||||
BASEPREFIX=`pwd`/depends
|
||||
|
||||
mkdir -p ${BASEPREFIX}/SDKs
|
||||
|
|
@ -104,14 +104,14 @@ script: |
|
|||
./autogen.sh
|
||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||
make dist
|
||||
SOURCEDIST=`echo beta-*.tar.gz`
|
||||
SOURCEDIST=`echo elements-*.tar.gz`
|
||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||
|
||||
# Correct tar file order
|
||||
mkdir -p temp
|
||||
pushd temp
|
||||
tar xf ../$SOURCEDIST
|
||||
find beta-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||
popd
|
||||
|
||||
ORIGPATH="$PATH"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
name: "beta-win-signer"
|
||||
name: "elements-win-signer"
|
||||
suites:
|
||||
- "trusty"
|
||||
architectures:
|
||||
|
|
@ -14,7 +14,7 @@ remotes:
|
|||
files:
|
||||
- "osslsigncode-1.7.1.tar.gz"
|
||||
- "osslsigncode-Backports-to-1.7.1.patch"
|
||||
- "beta-win-unsigned.tar.gz"
|
||||
- "elements-win-unsigned.tar.gz"
|
||||
script: |
|
||||
BUILD_DIR=`pwd`
|
||||
SIGDIR=${BUILD_DIR}/signature/win
|
||||
|
|
@ -24,7 +24,7 @@ script: |
|
|||
echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c
|
||||
|
||||
mkdir -p ${UNSIGNED_DIR}
|
||||
tar -C ${UNSIGNED_DIR} -xf beta-win-unsigned.tar.gz
|
||||
tar -C ${UNSIGNED_DIR} -xf elements-win-unsigned.tar.gz
|
||||
|
||||
tar xf osslsigncode-1.7.1.tar.gz
|
||||
cd osslsigncode-1.7.1
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ packages:
|
|||
- "python"
|
||||
remotes:
|
||||
- "url": "https://github.com/ElementsProject/elements.git"
|
||||
"dir": "beta"
|
||||
"dir": "elements"
|
||||
files: []
|
||||
script: |
|
||||
WRAP_DIR=$HOME/wrapped
|
||||
|
|
@ -101,7 +101,7 @@ script: |
|
|||
create_per-host_linker_wrapper "2000-01-01 12:00:00"
|
||||
export PATH=${WRAP_DIR}:${PATH}
|
||||
|
||||
cd beta
|
||||
cd elements
|
||||
BASEPREFIX=`pwd`/depends
|
||||
# Build dependencies for each host
|
||||
for i in $HOSTS; do
|
||||
|
|
@ -119,14 +119,14 @@ script: |
|
|||
./autogen.sh
|
||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||
make dist
|
||||
SOURCEDIST=`echo beta-*.tar.gz`
|
||||
SOURCEDIST=`echo elements-*.tar.gz`
|
||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||
|
||||
# Correct tar file order
|
||||
mkdir -p temp
|
||||
pushd temp
|
||||
tar xf ../$SOURCEDIST
|
||||
find beta-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||
find elements-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||
mkdir -p $OUTDIR/src
|
||||
cp ../$SOURCEDIST $OUTDIR/src
|
||||
popd
|
||||
|
|
@ -146,7 +146,7 @@ script: |
|
|||
make ${MAKEOPTS} -C src check-security
|
||||
make deploy
|
||||
make install DESTDIR=${INSTALLPATH}
|
||||
cp -f beta-*setup*.exe $OUTDIR/
|
||||
cp -f elements-*setup*.exe $OUTDIR/
|
||||
cd installed
|
||||
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
|
||||
find . -name "lib*.la" -delete
|
||||
|
|
|
|||
|
|
@ -11,5 +11,4 @@ This script should not be run manually, instead, after building as usual:
|
|||
During the process, the disk image window will pop up briefly where the fancy
|
||||
settings are applied. This is normal, please do not interfere.
|
||||
|
||||
When finished, it will produce `Beta-Sidechain.dmg`.
|
||||
|
||||
When finished, it will produce `Elements-Sidechain.dmg`.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
set -e
|
||||
|
||||
ROOTDIR=dist
|
||||
BUNDLE="${ROOTDIR}/Beta-Qt.app"
|
||||
BUNDLE="${ROOTDIR}/Elements-Qt.app"
|
||||
CODESIGN=codesign
|
||||
TEMPDIR=sign.temp
|
||||
TEMPLIST=${TEMPDIR}/signatures.txt
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<integer>370</integer>
|
||||
<integer>156</integer>
|
||||
</array>
|
||||
<key>Beta-Qt.app</key>
|
||||
<key>Elements-Qt.app</key>
|
||||
<array>
|
||||
<integer>128</integer>
|
||||
<integer>156</integer>
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ class FrameworkInfo(object):
|
|||
class ApplicationBundleInfo(object):
|
||||
def __init__(self, path):
|
||||
self.path = path
|
||||
appName = "Beta-Qt"
|
||||
appName = "Elements-Qt"
|
||||
self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
|
||||
if not os.path.exists(self.binaryPath):
|
||||
raise RuntimeError("Could not find bundle binary for " + path)
|
||||
|
|
@ -604,7 +604,7 @@ else:
|
|||
|
||||
# ------------------------------------------------
|
||||
|
||||
target = os.path.join("dist", "Beta-Qt.app")
|
||||
target = os.path.join("dist", "Elements-Qt.app")
|
||||
|
||||
if verbose >= 2:
|
||||
print("+ Copying source bundle +")
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ The following are some helpful notes on how to run Bitcoin on your native platfo
|
|||
|
||||
Unpack the files into a directory and run:
|
||||
|
||||
- `bin/beta-qt` (GUI) or
|
||||
- `bin/betad` (headless)
|
||||
- `bin/elements-qt` (GUI) or
|
||||
- `bin/elementsd` (headless)
|
||||
|
||||
### Windows
|
||||
|
||||
Unpack the files into a directory, and then run beta-qt.exe.
|
||||
Unpack the files into a directory, and then run elements-qt.exe.
|
||||
|
||||
### OS X
|
||||
|
||||
Drag Beta-Sidechain to your applications folder, and then run Beta-Sidechain.
|
||||
Drag Elements to your applications folder, and then run Elements.
|
||||
|
||||
### Need Help?
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ with each other, with the help of a P2P network to check for double-spending.
|
|||
|
||||
Setup
|
||||
-----
|
||||
Unpack the files into a directory and run beta-qt.exe.
|
||||
Unpack the files into a directory and run elements-qt.exe.
|
||||
|
||||
Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
|
||||
However, it downloads and stores the entire history of Bitcoin transactions;
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ In case you want to build the disk image with `make deploy` (.dmg / optional), y
|
|||
|
||||
NOTE: Building with Qt4 is still supported, however, could result in a broken UI. Building with Qt5 is recommended.
|
||||
|
||||
Build `Beta`
|
||||
Build `Element`
|
||||
------------------------
|
||||
|
||||
1. Clone the beta source code and cd into `beta`
|
||||
1. Clone the elements source code and cd into `elements`
|
||||
|
||||
git clone https://github.com/ElementsProject/elements.git
|
||||
cd elements
|
||||
|
|
@ -53,7 +53,7 @@ Build `Beta`
|
|||
Running
|
||||
-------
|
||||
|
||||
Beta is now available at `./src/beta`
|
||||
Element is now available at `./src/elements`
|
||||
|
||||
Before running, it's recommended you create an RPC configuration file.
|
||||
|
||||
|
|
@ -61,18 +61,18 @@ Before running, it's recommended you create an RPC configuration file.
|
|||
|
||||
chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
|
||||
|
||||
The first time you run betad, it will start downloading the blockchain. This process could take several hours.
|
||||
The first time you run elementsd, it will start downloading the blockchain. This process could take several hours.
|
||||
|
||||
You can monitor the download process by looking at the debug.log file:
|
||||
|
||||
tail -f $HOME/Library/Application\ Support/beta/debug.log
|
||||
tail -f $HOME/Library/Application\ Support/elements/debug.log
|
||||
|
||||
Other commands:
|
||||
-------
|
||||
|
||||
./src/betad -daemon # Starts the bitcoin daemon.
|
||||
./src/beta-cli --help # Outputs a list of command-line options.
|
||||
./src/beta-cli help # Outputs a list of RPC commands when the daemon is running.
|
||||
./src/elementsd -daemon # Starts the bitcoin daemon.
|
||||
./src/elements-cli --help # Outputs a list of command-line options.
|
||||
./src/elements-cli help # Outputs a list of RPC commands when the daemon is running.
|
||||
|
||||
Using Qt Creator as IDE
|
||||
------------------------
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ make
|
|||
make install # optional
|
||||
```
|
||||
|
||||
This will build beta-qt as well if the dependencies are met.
|
||||
This will build elements-qt as well if the dependencies are met.
|
||||
|
||||
Dependencies
|
||||
---------------------
|
||||
|
|
@ -107,7 +107,7 @@ ZMQ dependencies (provides ZMQ API 4.x):
|
|||
Dependencies for the GUI: Ubuntu & Debian
|
||||
-----------------------------------------
|
||||
|
||||
If you want to build Beta-Qt, make sure that the required packages for Qt development
|
||||
If you want to build Elements-Qt, make sure that the required packages for Qt development
|
||||
are installed. Either Qt 5 or Qt 4 are necessary to build the GUI.
|
||||
If both Qt 4 and Qt 5 are installed, Qt 5 will be used. Pass `--with-gui=qt4` to configure to choose Qt4.
|
||||
To build without GUI pass `--without-gui`.
|
||||
|
|
@ -124,7 +124,7 @@ libqrencode (optional) can be installed with:
|
|||
|
||||
sudo apt-get install libqrencode-dev
|
||||
|
||||
Once these are installed, they will be found by configure and a beta-qt executable will be
|
||||
Once these are installed, they will be found by configure and a elements-qt executable will be
|
||||
built by default.
|
||||
|
||||
Dependency Build Instructions: Fedora
|
||||
|
|
@ -147,7 +147,7 @@ libqrencode (optional) can be installed with:
|
|||
|
||||
Notes
|
||||
-----
|
||||
The release is built with GCC and then "strip betad" to strip the debug
|
||||
The release is built with GCC and then "strip elementsd" to strip the debug
|
||||
symbols, which reduces the executable size by about 90%.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ for arg in sys.argv[1:]:
|
|||
|
||||
#Set env vars
|
||||
if "BITCOIND" not in os.environ:
|
||||
os.environ["BETAD"] = BUILDDIR+ '/src/betad' + EXEEXT
|
||||
os.environ["ELEMENTSD"] = BUILDDIR+ '/src/elementsd' + EXEEXT
|
||||
|
||||
if EXEEXT == ".exe" and "-win" not in opts:
|
||||
# https://github.com/bitcoin/bitcoin/commit/d52802551752140cf41f0d9a225a43e84404d3e9
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class KeyPoolTest(BitcoinTestFramework):
|
|||
time.sleep(1.1)
|
||||
assert_equal(nodes[0].getwalletinfo()["unlocked_until"], 0)
|
||||
|
||||
# drain them by mining #Not in beta regtest
|
||||
# drain them by mining #Not in elements regtest
|
||||
#nodes[0].generate(1)
|
||||
#nodes[0].generate(1)
|
||||
#nodes[0].generate(1)
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class TestManager(NodeConnCB):
|
|||
class MaxBlocksInFlightTest(BitcoinTestFramework):
|
||||
def add_options(self, parser):
|
||||
parser.add_option("--testbinary", dest="testbinary",
|
||||
default=os.getenv("BETAD", "betad"),
|
||||
default=os.getenv("ELEMENTSD", "elementsd"),
|
||||
help="Binary to test max block requests behavior")
|
||||
|
||||
def __init__(self):
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class HTTPBasicsTest (BitcoinTestFramework):
|
|||
#Append rpcauth to bitcoin.conf before initialization
|
||||
rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144"
|
||||
rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
|
||||
with open(os.path.join(self.options.tmpdir+"/node0", "beta.conf"), 'a', encoding='utf8') as f:
|
||||
with open(os.path.join(self.options.tmpdir+"/node0", "elements.conf"), 'a', encoding='utf8') as f:
|
||||
f.write(rpcauth+"\n")
|
||||
f.write(rpcauth2+"\n")
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ class TestNode(NodeConnCB):
|
|||
class AcceptBlockTest(BitcoinTestFramework):
|
||||
def add_options(self, parser):
|
||||
parser.add_option("--testbinary", dest="testbinary",
|
||||
default=os.getenv("BETAD", "betad"),
|
||||
default=os.getenv("ELEMENTSD", "elementsd"),
|
||||
help="bitcoind binary to test")
|
||||
|
||||
def __init__(self):
|
||||
|
|
|
|||
|
|
@ -205,10 +205,10 @@ class ComparisonTestFramework(BitcoinTestFramework):
|
|||
|
||||
def add_options(self, parser):
|
||||
parser.add_option("--testbinary", dest="testbinary",
|
||||
default=os.getenv("BETAD", "betad"),
|
||||
default=os.getenv("ELEMENTSD", "elementsd"),
|
||||
help="bitcoind binary to test")
|
||||
parser.add_option("--refbinary", dest="refbinary",
|
||||
default=os.getenv("BETAD", "betad"),
|
||||
default=os.getenv("ELEMENTSD", "elementsd"),
|
||||
help="bitcoind binary to use for reference nodes (if any)")
|
||||
|
||||
def setup_network(self):
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ def initialize_datadir(dirname, n):
|
|||
if not os.path.isdir(datadir):
|
||||
os.makedirs(datadir)
|
||||
rpc_u, rpc_p = rpc_auth_pair(n)
|
||||
with open(os.path.join(datadir, "beta.conf"), 'w', encoding='utf8') as f:
|
||||
with open(os.path.join(datadir, "elements.conf"), 'w', encoding='utf8') as f:
|
||||
f.write("regtest=1\n")
|
||||
f.write("rpcuser=" + rpc_u + "\n")
|
||||
f.write("rpcpassword=" + rpc_p + "\n")
|
||||
|
|
@ -249,7 +249,7 @@ def initialize_chain(test_dir, num_nodes, cachedir):
|
|||
# Create cache directories, run bitcoinds:
|
||||
for i in range(MAX_NODES):
|
||||
datadir=initialize_datadir(cachedir, i)
|
||||
args = [ os.getenv("BETAD", "betad"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
|
||||
args = [ os.getenv("ELEMENTSD", "elementsd"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ]
|
||||
if i > 0:
|
||||
args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
|
||||
bitcoind_processes[i] = subprocess.Popen(args)
|
||||
|
|
@ -335,7 +335,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=
|
|||
"""
|
||||
datadir = os.path.join(dirname, "node"+str(i))
|
||||
if binary is None:
|
||||
binary = os.getenv("BETAD", "betad")
|
||||
binary = os.getenv("ELEMENTSD", "elementsd")
|
||||
args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-mocktime="+str(get_mocktime()) ]
|
||||
if extra_args is not None: args.extend(extra_args)
|
||||
bitcoind_processes[i] = subprocess.Popen(args)
|
||||
|
|
@ -368,7 +368,7 @@ def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, timewait=None
|
|||
return rpcs
|
||||
|
||||
def log_filename(dirname, n_node, logname):
|
||||
return os.path.join(dirname, "node"+str(n_node), "betaregtest", logname)
|
||||
return os.path.join(dirname, "node"+str(n_node), "elementsregtest", logname)
|
||||
|
||||
def stop_node(node, i):
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Threat analysis
|
|||
--
|
||||
|
||||
Gavin is a single point of failure. He could be coerced to divulge the secret signing keys,
|
||||
allowing somebody to distribute a Beta-Qt.app or beta-qt-setup.exe with a valid
|
||||
allowing somebody to distribute a Elements-Qt.app or elements-qt-setup.exe with a valid
|
||||
signature but containing a malicious binary.
|
||||
|
||||
Or the machine Gavin uses to sign the binaries could be compromised, either remotely or
|
||||
|
|
@ -34,7 +34,7 @@ or divulge the private keys).
|
|||
|
||||
Windows binaries are reproducibly 'gitian-built', and the setup.exe file created
|
||||
by the NSIS installer system is a 7zip archive, so you could check to make sure
|
||||
that the beta-qt.exe file inside the installer had not been tampered with.
|
||||
that the elements-qt.exe file inside the installer had not been tampered with.
|
||||
However, an attacker could modify the installer's code, so when the setup.exe
|
||||
was run it compromised users' systems. A volunteer to write an auditing tool
|
||||
that checks the setup.exe for tampering, and checks the files in it against
|
||||
|
|
|
|||
|
|
@ -29,16 +29,16 @@
|
|||
<string>????</string>
|
||||
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>Beta-Qt</string>
|
||||
<string>Elements-Qt</string>
|
||||
|
||||
<key>CFBundleName</key>
|
||||
<string>Beta-Qt</string>
|
||||
<string>Elements-Qt</string>
|
||||
|
||||
<key>LSHasLocalizedDisplayName</key>
|
||||
<true/>
|
||||
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.elementsproject.Beta-Qt</string>
|
||||
<string>org.elementsproject.Elements-Qt</string>
|
||||
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array>
|
||||
|
|
@ -46,10 +46,10 @@
|
|||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleURLName</key>
|
||||
<string>org.elementsproject.BetaPayment</string>
|
||||
<string>org.elementsproject.ElementsPayment</string>
|
||||
<key>CFBundleURLSchemes</key>
|
||||
<array>
|
||||
<string>beta</string>
|
||||
<string>elements</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
<key>UTTypeIdentifier</key>
|
||||
<string>org.elementsproject.paymentrequest</string>
|
||||
<key>UTTypeDescription</key>
|
||||
<string>Beta payment request</string>
|
||||
<string>Elements payment request</string>
|
||||
<key>UTTypeConformsTo</key>
|
||||
<array>
|
||||
<string>public.data</string>
|
||||
|
|
@ -68,10 +68,10 @@
|
|||
<key>UTTypeTagSpecification</key>
|
||||
<dict>
|
||||
<key>public.mime-type</key>
|
||||
<string>application/x-beta-payment-request</string>
|
||||
<string>application/x-elements-payment-request</string>
|
||||
<key>public.filename-extension</key>
|
||||
<array>
|
||||
<string>betapaymentrequest</string>
|
||||
<string>elementspaymentrequest</string>
|
||||
</array>
|
||||
</dict>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ if ENABLE_ZMQ
|
|||
LIBBITCOIN_ZMQ=libbitcoin_zmq.a
|
||||
endif
|
||||
if BUILD_BITCOIN_LIBS
|
||||
LIBBITCOINCONSENSUS=libbetaconsensus.la
|
||||
LIBBITCOINCONSENSUS=libelementsconsensus.la
|
||||
endif
|
||||
if ENABLE_WALLET
|
||||
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
||||
|
|
@ -66,11 +66,11 @@ TESTS =
|
|||
BENCHMARKS =
|
||||
|
||||
if BUILD_BITCOIND
|
||||
bin_PROGRAMS += betad
|
||||
bin_PROGRAMS += elementsd
|
||||
endif
|
||||
|
||||
if BUILD_BITCOIN_UTILS
|
||||
bin_PROGRAMS += beta-cli beta-tx
|
||||
bin_PROGRAMS += elements-cli elements-tx
|
||||
endif
|
||||
|
||||
.PHONY: FORCE check-symbols check-security
|
||||
|
|
@ -370,16 +370,16 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
|
|||
#
|
||||
|
||||
# bitcoind binary #
|
||||
betad_SOURCES = bitcoind.cpp
|
||||
betad_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
betad_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
betad_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
elementsd_SOURCES = bitcoind.cpp
|
||||
elementsd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
elementsd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
elementsd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
betad_SOURCES += bitcoind-res.rc
|
||||
elementsd_SOURCES += bitcoind-res.rc
|
||||
endif
|
||||
|
||||
betad_LDADD = \
|
||||
elementsd_LDADD = \
|
||||
$(LIBBITCOIN_SERVER) \
|
||||
$(LIBBITCOIN_COMMON) \
|
||||
$(LIBUNIVALUE) \
|
||||
|
|
@ -392,38 +392,38 @@ betad_LDADD = \
|
|||
$(LIBMEMENV) \
|
||||
$(LIBSECP256K1)
|
||||
|
||||
betad_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
|
||||
elementsd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS)
|
||||
|
||||
# bitcoin-cli binary #
|
||||
beta_cli_SOURCES = bitcoin-cli.cpp
|
||||
beta_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
beta_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
beta_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
elements_cli_SOURCES = bitcoin-cli.cpp
|
||||
elements_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
elements_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
elements_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
beta_cli_SOURCES += bitcoin-cli-res.rc
|
||||
elements_cli_SOURCES += bitcoin-cli-res.rc
|
||||
endif
|
||||
|
||||
beta_cli_LDADD = \
|
||||
elements_cli_LDADD = \
|
||||
$(LIBBITCOIN_CLI) \
|
||||
$(LIBUNIVALUE) \
|
||||
$(LIBBITCOIN_UTIL) \
|
||||
$(LIBBITCOIN_CRYPTO)
|
||||
|
||||
beta_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
|
||||
elements_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
|
||||
#
|
||||
|
||||
# bitcoin-tx binary #
|
||||
beta_tx_SOURCES = bitcoin-tx.cpp
|
||||
beta_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
beta_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
beta_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
elements_tx_SOURCES = bitcoin-tx.cpp
|
||||
elements_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
elements_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
elements_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
if TARGET_WINDOWS
|
||||
beta_tx_SOURCES += bitcoin-tx-res.rc
|
||||
elements_tx_SOURCES += bitcoin-tx-res.rc
|
||||
endif
|
||||
|
||||
beta_tx_LDADD = \
|
||||
elements_tx_LDADD = \
|
||||
$(LIBUNIVALUE) \
|
||||
$(LIBBITCOIN_COMMON) \
|
||||
$(LIBBITCOIN_UTIL) \
|
||||
|
|
@ -431,22 +431,22 @@ beta_tx_LDADD = \
|
|||
$(LIBBITCOIN_CRYPTO) \
|
||||
$(LIBSECP256K1)
|
||||
|
||||
beta_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
|
||||
elements_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
|
||||
#
|
||||
|
||||
# bitcoinconsensus library #
|
||||
if BUILD_BITCOIN_LIBS
|
||||
include_HEADERS = script/bitcoinconsensus.h
|
||||
libbetaconsensus_la_SOURCES = $(crypto_libbitcoin_crypto_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
|
||||
libelementsconsensus_la_SOURCES = $(crypto_libbitcoin_crypto_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
|
||||
|
||||
if GLIBC_BACK_COMPAT
|
||||
libbetaconsensus_la_SOURCES += compat/glibc_compat.cpp
|
||||
libelementsconsensus_la_SOURCES += compat/glibc_compat.cpp
|
||||
endif
|
||||
|
||||
libbetaconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0 $(RELDFLAGS)
|
||||
libbetaconsensus_la_LIBADD = $(LIBSECP256K1)
|
||||
libbetaconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -DBITCOIN_SCRIPT_NO_CALLRPC
|
||||
libbetaconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
libelementsconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0 $(RELDFLAGS)
|
||||
libelementsconsensus_la_LIBADD = $(LIBSECP256K1)
|
||||
libelementsconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -DBITCOIN_SCRIPT_NO_CALLRPC
|
||||
libelementsconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
|
||||
endif
|
||||
#
|
||||
|
|
@ -484,7 +484,7 @@ clean-local:
|
|||
-rm -rf test/__pycache__
|
||||
|
||||
bitcoind bitcoin-cli bitcoin-tx:
|
||||
@echo "Remember to 'make beta*' rather than 'make bitcoin*' in this repository."
|
||||
@echo "Remember to 'make elements*' rather than 'make bitcoin*' in this repository."
|
||||
|
||||
.rc.o:
|
||||
@test -f $(WINDRES)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
bin_PROGRAMS += qt/beta-qt
|
||||
bin_PROGRAMS += qt/elements-qt
|
||||
EXTRA_LIBRARIES += qt/libbitcoinqt.a
|
||||
|
||||
# bitcoin qt core #
|
||||
|
|
@ -378,7 +378,7 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:
|
|||
# Most files will depend on the forms and moc files as includes. Generate them
|
||||
# before anything else.
|
||||
$(QT_MOC): $(QT_FORMS_H)
|
||||
$(qt_libbitcoinqt_a_OBJECTS) $(qt_beta_qt_OBJECTS) : | $(QT_MOC)
|
||||
$(qt_libbitcoinqt_a_OBJECTS) $(qt_elements_qt_OBJECTS) : | $(QT_MOC)
|
||||
|
||||
#Generating these with a half-written protobuf header leads to wacky results.
|
||||
#This makes sure it's done.
|
||||
|
|
@ -386,29 +386,29 @@ $(QT_MOC): $(PROTOBUF_H)
|
|||
$(QT_MOC_CPP): $(PROTOBUF_H)
|
||||
|
||||
# bitcoin-qt binary #
|
||||
qt_beta_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
|
||||
qt_elements_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
|
||||
$(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
|
||||
qt_beta_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
|
||||
qt_elements_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
|
||||
|
||||
qt_beta_qt_SOURCES = qt/bitcoin.cpp
|
||||
qt_elements_qt_SOURCES = qt/bitcoin.cpp
|
||||
if TARGET_DARWIN
|
||||
qt_beta_qt_SOURCES += $(BITCOIN_MM)
|
||||
qt_elements_qt_SOURCES += $(BITCOIN_MM)
|
||||
endif
|
||||
if TARGET_WINDOWS
|
||||
qt_beta_qt_SOURCES += $(BITCOIN_RC)
|
||||
qt_elements_qt_SOURCES += $(BITCOIN_RC)
|
||||
endif
|
||||
qt_beta_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
|
||||
qt_elements_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
|
||||
if ENABLE_WALLET
|
||||
qt_beta_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||
qt_elements_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||
endif
|
||||
if ENABLE_ZMQ
|
||||
qt_beta_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
|
||||
qt_elements_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
|
||||
endif
|
||||
qt_beta_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||
qt_elements_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
|
||||
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
|
||||
qt_beta_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
qt_beta_qt_LIBTOOLFLAGS = --tag CXX
|
||||
qt_elements_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
qt_elements_qt_LIBTOOLFLAGS = --tag CXX
|
||||
|
||||
#locale/foo.ts -> locale/foo.qm
|
||||
QT_QM=$(QT_TS:.ts=.qm)
|
||||
|
|
@ -439,10 +439,10 @@ CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda
|
|||
|
||||
CLEANFILES += $(CLEAN_QT)
|
||||
|
||||
beta_qt_clean: FORCE
|
||||
rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_beta_qt_OBJECTS) qt/beta-qt$(EXEEXT) $(LIBBITCOINQT)
|
||||
elements_qt_clean: FORCE
|
||||
rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_elements_qt_OBJECTS) qt/elements-qt$(EXEEXT) $(LIBBITCOINQT)
|
||||
|
||||
beta_qt : qt/beta-qt$(EXEEXT)
|
||||
elements_qt : qt/elements-qt$(EXEEXT)
|
||||
|
||||
ui_%.h: %.ui
|
||||
@test -f $(UIC)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
bin_PROGRAMS += qt/test/test_beta-qt
|
||||
TESTS += qt/test/test_beta-qt
|
||||
bin_PROGRAMS += qt/test/test_elements-qt
|
||||
TESTS += qt/test/test_elements-qt
|
||||
|
||||
TEST_QT_MOC_CPP = \
|
||||
qt/test/moc_compattests.cpp \
|
||||
|
|
@ -21,44 +21,44 @@ TEST_QT_H = \
|
|||
qt/test/paymentrequestdata.h \
|
||||
qt/test/paymentservertests.h
|
||||
|
||||
qt_test_test_beta_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
|
||||
qt_test_test_elements_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
|
||||
$(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
|
||||
|
||||
qt_test_test_beta_qt_SOURCES = \
|
||||
qt_test_test_elements_qt_SOURCES = \
|
||||
qt/test/compattests.cpp \
|
||||
qt/test/rpcnestedtests.cpp \
|
||||
qt/test/test_main.cpp \
|
||||
qt/test/uritests.cpp \
|
||||
$(TEST_QT_H)
|
||||
if ENABLE_WALLET
|
||||
qt_test_test_beta_qt_SOURCES += \
|
||||
qt_test_test_elements_qt_SOURCES += \
|
||||
qt/test/paymentservertests.cpp
|
||||
endif
|
||||
|
||||
nodist_qt_test_test_beta_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
||||
nodist_qt_test_test_elements_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
||||
|
||||
qt_test_test_beta_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
||||
qt_test_test_elements_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
||||
if ENABLE_WALLET
|
||||
qt_test_test_beta_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||
qt_test_test_elements_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||
endif
|
||||
if ENABLE_ZMQ
|
||||
qt_test_test_beta_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
|
||||
qt_test_test_elements_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
|
||||
endif
|
||||
qt_test_test_beta_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
|
||||
qt_test_test_elements_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
|
||||
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
|
||||
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
|
||||
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
|
||||
qt_test_test_beta_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
qt_test_test_beta_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
|
||||
qt_test_test_elements_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
qt_test_test_elements_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
|
||||
|
||||
CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno
|
||||
|
||||
CLEANFILES += $(CLEAN_BITCOIN_QT_TEST)
|
||||
|
||||
test_beta_qt : qt/test/test_beta-qt$(EXEEXT)
|
||||
test_elements_qt : qt/test/test_elements-qt$(EXEEXT)
|
||||
|
||||
test_beta_qt_check : qt/test/test_beta-qt$(EXEEXT) FORCE
|
||||
test_elements_qt_check : qt/test/test_elements-qt$(EXEEXT) FORCE
|
||||
$(MAKE) check-TESTS TESTS=$^
|
||||
|
||||
test_beta_qt_clean: FORCE
|
||||
rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_beta_qt_OBJECTS)
|
||||
test_elements_qt_clean: FORCE
|
||||
rm -f $(CLEAN_BITCOIN_QT_TEST) $(qt_test_test_elements_qt_OBJECTS)
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
# Distributed under the MIT software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
TESTS += test/test_beta
|
||||
bin_PROGRAMS += test/test_beta
|
||||
noinst_PROGRAMS += test/test_beta_fuzzy
|
||||
TESTS += test/test_elements
|
||||
bin_PROGRAMS += test/test_elements
|
||||
noinst_PROGRAMS += test/test_elements_fuzzy
|
||||
TEST_SRCDIR = test
|
||||
TEST_BINARY=test/test_beta$(EXEEXT)
|
||||
TEST_BINARY=test/test_elements$(EXEEXT)
|
||||
|
||||
|
||||
EXTRA_DIST += \
|
||||
|
|
@ -148,30 +148,30 @@ BITCOIN_TESTS += \
|
|||
wallet/test/crypto_tests.cpp
|
||||
endif
|
||||
|
||||
test_test_beta_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
|
||||
test_test_beta_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS)
|
||||
test_test_beta_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||
test_test_elements_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
|
||||
test_test_elements_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
|
||||
test_test_elements_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS)
|
||||
test_test_beta_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
test_test_elements_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
if ENABLE_WALLET
|
||||
test_test_beta_LDADD += $(LIBBITCOIN_WALLET)
|
||||
test_test_elements_LDADD += $(LIBBITCOIN_WALLET)
|
||||
endif
|
||||
|
||||
test_test_beta_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
|
||||
test_test_beta_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
|
||||
test_test_elements_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
|
||||
test_test_elements_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
|
||||
|
||||
if ENABLE_ZMQ
|
||||
test_test_beta_LDADD += $(ZMQ_LIBS)
|
||||
test_test_elements_LDADD += $(ZMQ_LIBS)
|
||||
endif
|
||||
#
|
||||
|
||||
# test_bitcoin_fuzzy binary #
|
||||
test_test_beta_fuzzy_SOURCES = test/test_bitcoin_fuzzy.cpp
|
||||
test_test_beta_fuzzy_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
test_test_beta_fuzzy_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
test_test_beta_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
test_test_elements_fuzzy_SOURCES = test/test_bitcoin_fuzzy.cpp
|
||||
test_test_elements_fuzzy_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
||||
test_test_elements_fuzzy_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||
test_test_elements_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||
|
||||
test_test_beta_fuzzy_LDADD = \
|
||||
test_test_elements_fuzzy_LDADD = \
|
||||
$(LIBUNIVALUE) \
|
||||
$(LIBBITCOIN_SERVER) \
|
||||
$(LIBBITCOIN_COMMON) \
|
||||
|
|
@ -180,10 +180,10 @@ test_test_beta_fuzzy_LDADD = \
|
|||
$(LIBBITCOIN_CRYPTO) \
|
||||
$(LIBSECP256K1)
|
||||
|
||||
test_test_beta_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
|
||||
test_test_elements_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
|
||||
#
|
||||
|
||||
nodist_test_test_beta_SOURCES = $(GENERATED_TEST_FILES)
|
||||
nodist_test_test_elements_SOURCES = $(GENERATED_TEST_FILES)
|
||||
|
||||
$(BITCOIN_TESTS): $(GENERATED_TEST_FILES)
|
||||
|
||||
|
|
@ -194,13 +194,13 @@ CLEANFILES += $(CLEAN_BITCOIN_TEST)
|
|||
# This file is problematic for out-of-tree builds if it exists.
|
||||
DISTCLEANFILES += test/buildenv.pyc
|
||||
|
||||
beta_test: $(TEST_BINARY)
|
||||
elements_test: $(TEST_BINARY)
|
||||
|
||||
beta_test_check: $(TEST_BINARY) FORCE
|
||||
elements_test_check: $(TEST_BINARY) FORCE
|
||||
$(MAKE) check-TESTS TESTS=$^
|
||||
|
||||
beta_test_clean : FORCE
|
||||
rm -f $(CLEAN_BITCOIN_TEST) $(test_test_beta_OBJECTS) $(TEST_BINARY)
|
||||
elements_test_clean : FORCE
|
||||
rm -f $(CLEAN_BITCOIN_TEST) $(test_test_elements_OBJECTS) $(TEST_BINARY)
|
||||
|
||||
check-local:
|
||||
@echo "Running test/bitcoin-util-test.py..."
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ BEGIN
|
|||
VALUE "CompanyName", "Elements project"
|
||||
VALUE "FileDescription", "bitcoin-cli (JSON-RPC client for " PACKAGE_NAME ")"
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", "beta-cli"
|
||||
VALUE "InternalName", "elements-cli"
|
||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||
VALUE "OriginalFilename", "beta-cli.exe"
|
||||
VALUE "ProductName", "beta-cli"
|
||||
VALUE "OriginalFilename", "elements-cli.exe"
|
||||
VALUE "ProductName", "elements-cli"
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ BEGIN
|
|||
BLOCK "040904E4" // U.S. English - multilingual (hex)
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Elements project"
|
||||
VALUE "FileDescription", "beta-tx (CLI Elements Beta transaction editor utility)"
|
||||
VALUE "FileDescription", "elements-tx (CLI Elements Core transaction editor utility)"
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", "beta-tx"
|
||||
VALUE "InternalName", "elements-tx"
|
||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||
VALUE "OriginalFilename", "beta-tx.exe"
|
||||
VALUE "ProductName", "beta-tx"
|
||||
VALUE "OriginalFilename", "elements-tx.exe"
|
||||
VALUE "ProductName", "elements-tx"
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -58,10 +58,10 @@ static int AppInitRawTx(int argc, char* argv[])
|
|||
if (argc<2 || IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help"))
|
||||
{
|
||||
// First part of help message is specific to this utility
|
||||
std::string strUsage = strprintf(_("%s beta-tx utility version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n\n" +
|
||||
std::string strUsage = strprintf(_("%s elements-tx utility version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n\n" +
|
||||
_("Usage:") + "\n" +
|
||||
" beta-tx [options] <hex-tx> [commands] " + _("Update hex-encoded bitcoin transaction") + "\n" +
|
||||
" beta-tx [options] -create [commands] " + _("Create hex-encoded bitcoin transaction") + "\n" +
|
||||
" elements-tx [options] <hex-tx> [commands] " + _("Update hex-encoded bitcoin transaction") + "\n" +
|
||||
" elements-tx [options] -create [commands] " + _("Create hex-encoded bitcoin transaction") + "\n" +
|
||||
"\n";
|
||||
|
||||
fprintf(stdout, "%s", strUsage.c_str());
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ BEGIN
|
|||
BEGIN
|
||||
BLOCK "040904E4" // U.S. English - multilingual (hex)
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Elements project"
|
||||
VALUE "FileDescription", "betad (Elements Beta node with a JSON-RPC server)"
|
||||
VALUE "CompanyName", "Elements Project"
|
||||
VALUE "FileDescription", "elementsd (Elements Core node with a JSON-RPC server)"
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", "betad"
|
||||
VALUE "InternalName", "elementsd"
|
||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||
VALUE "OriginalFilename", "betad.exe"
|
||||
VALUE "ProductName", "betad"
|
||||
VALUE "OriginalFilename", "elementsd.exe"
|
||||
VALUE "ProductName", "elementsd"
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ bool AppInit(int argc, char* argv[])
|
|||
else
|
||||
{
|
||||
strUsage += "\n" + _("Usage:") + "\n" +
|
||||
" betad [options] " + strprintf(_("Start %s Daemon"), _(PACKAGE_NAME)) + "\n";
|
||||
" elementsd [options] " + strprintf(_("Start %s Daemon"), _(PACKAGE_NAME)) + "\n";
|
||||
|
||||
strUsage += "\n" + HelpMessage(HMM_BITCOIND);
|
||||
}
|
||||
|
|
@ -125,7 +125,7 @@ bool AppInit(int argc, char* argv[])
|
|||
|
||||
if (fCommandLine)
|
||||
{
|
||||
fprintf(stderr, "Error: There is no RPC client functionality in betad anymore. Use the bitcoin-cli utility instead.\n");
|
||||
fprintf(stderr, "Error: There is no RPC client functionality in elementsd anymore. Use the bitcoin-cli utility instead.\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
// -server defaults to true for bitcoind but not for the GUI so do this here
|
||||
|
|
@ -151,7 +151,7 @@ bool AppInit(int argc, char* argv[])
|
|||
if (GetBoolArg("-daemon", false))
|
||||
{
|
||||
#if HAVE_DECL_DAEMON
|
||||
fprintf(stdout, "Bitcoin server starting\n");
|
||||
fprintf(stdout, "Elements server starting\n");
|
||||
|
||||
// Daemonize
|
||||
if (daemon(1, 0)) { // don't chdir (1), do close FDs (0)
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ void CChainParams::UpdateBIP9Parameters(Consensus::DeploymentPos d, int64_t nSta
|
|||
}
|
||||
|
||||
/**
|
||||
* Elements Beta.
|
||||
* Elements Core.
|
||||
|
||||
*/
|
||||
class CElementsParams : public CChainParams {
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
#include <vector>
|
||||
|
||||
#define CHAINPARAMS_OLD_MAIN "main"
|
||||
#define CHAINPARAMS_ELEMENTS "betatestnet3"
|
||||
#define CHAINPARAMS_REGTEST "betaregtest"
|
||||
#define CHAINPARAMS_ELEMENTS "elements"
|
||||
#define CHAINPARAMS_REGTEST "elementsregtest"
|
||||
|
||||
/**
|
||||
* CBaseChainParams defines the base parameters (shared between bitcoin-cli and bitcoind)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
.PHONY: FORCE
|
||||
all: FORCE
|
||||
$(MAKE) -C .. beta_qt test_beta_qt
|
||||
$(MAKE) -C .. elements_qt test_elements_qt
|
||||
clean: FORCE
|
||||
$(MAKE) -C .. beta_qt_clean test_beta_qt_clean
|
||||
$(MAKE) -C .. elements_qt_clean test_elements_qt_clean
|
||||
check: FORCE
|
||||
$(MAKE) -C .. test_beta_qt_check
|
||||
beta-qt beta-qt.exe: FORCE
|
||||
$(MAKE) -C .. beta_qt
|
||||
$(MAKE) -C .. test_elements_qt_check
|
||||
elements-qt elements-qt.exe: FORCE
|
||||
$(MAKE) -C .. elements_qt
|
||||
|
|
|
|||
|
|
@ -266,9 +266,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"),
|
|||
QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Elements Beta Daemon"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Elements Beta RPC client version"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Elements Beta bitcoin-tx utility version"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Elements Daemon"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Elements RPC client version"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Elements bitcoin-tx utility version"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash block in <address>"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash transaction in <address>"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw block in <address>"),
|
||||
|
|
@ -358,7 +358,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"),
|
|||
QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Start Elements Beta Daemon"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Start Elements Daemon"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "The wallet will avoid paying less than the minimum relay fee."),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."),
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ static const int MAX_URI_LENGTH = 255;
|
|||
|
||||
#define QAPP_ORG_NAME "ElementsProject"
|
||||
#define QAPP_ORG_DOMAIN "elementsproject.org"
|
||||
#define QAPP_APP_NAME_DEFAULT "Beta-Qt"
|
||||
#define QAPP_APP_NAME_TESTNET "Beta-Qt-testnet"
|
||||
#define QAPP_APP_NAME_DEFAULT "Elements-Qt"
|
||||
#define QAPP_APP_NAME_TESTNET "Elements-Qt-testnet"
|
||||
|
||||
#endif // BITCOIN_QT_GUICONSTANTS_H
|
||||
|
|
|
|||
|
|
@ -743,7 +743,7 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
|||
// Write a bitcoin.desktop file to the autostart directory:
|
||||
optionFile << "[Desktop Entry]\n";
|
||||
optionFile << "Type=Application\n";
|
||||
optionFile << strprintf("Name=Elements Beta (%s)\n", chain);
|
||||
optionFile << strprintf("Name=Elements Core (%s)\n", chain);
|
||||
optionFile << "Exec=" << pszExePath << strprintf(" -min -chain=%s\n", chain);
|
||||
optionFile << "Terminal=false\n";
|
||||
optionFile << "Hidden=false\n";
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
- (NSString *)__bundleIdentifier
|
||||
{
|
||||
if (self == [NSBundle mainBundle]) {
|
||||
return @"org.elementsproject.Beta-Qt";
|
||||
return @"org.elementsproject.Elements-Qt";
|
||||
} else {
|
||||
return [self __bundleIdentifier];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ BEGIN
|
|||
VALUE "CompanyName", "Elements project"
|
||||
VALUE "FileDescription", PACKAGE_NAME " (GUI node for Bitcoin)"
|
||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||
VALUE "InternalName", "beta-qt"
|
||||
VALUE "InternalName", "elements-qt"
|
||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||
VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||
VALUE "OriginalFilename", "beta-qt.exe"
|
||||
VALUE "OriginalFilename", "elements-qt.exe"
|
||||
VALUE "ProductName", PACKAGE_NAME
|
||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||
END
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ int main(int argc, char *argv[])
|
|||
// Don't remove this, it's needed to access
|
||||
// QCoreApplication:: in the tests
|
||||
QCoreApplication app(argc, argv);
|
||||
app.setApplicationName("Beta-Qt-test");
|
||||
app.setApplicationName("Elements-Qt-test");
|
||||
|
||||
SSL_library_init();
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
|
|||
} else {
|
||||
setWindowTitle(tr("Command-line options"));
|
||||
QString header = tr("Usage:") + "\n" +
|
||||
" beta-qt [" + tr("command-line options") + "] " + "\n";
|
||||
" elements-qt [" + tr("command-line options") + "] " + "\n";
|
||||
QTextCursor cursor(ui->helpMessage->document());
|
||||
cursor.insertText(version);
|
||||
cursor.insertBlock();
|
||||
|
|
|
|||
|
|
@ -269,11 +269,11 @@ UniValue stop(const JSONRPCRequest& jsonRequest)
|
|||
if (jsonRequest.fHelp || jsonRequest.params.size() > 1)
|
||||
throw runtime_error(
|
||||
"stop\n"
|
||||
"\nStop Beta server.");
|
||||
"\nStop Elements server.");
|
||||
// Event loop will exit after current HTTP requests have been handled, so
|
||||
// this reply will get back to the client.
|
||||
StartShutdown();
|
||||
return "Beta server stopping";
|
||||
return "Elements server stopping";
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey, bool&
|
|||
break;
|
||||
}
|
||||
case TX_TRUE:
|
||||
if (Params().NetworkIDString() == "betaregtest")
|
||||
if (Params().NetworkIDString() == CHAINPARAMS_REGTEST)
|
||||
return ISMINE_SPENDABLE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
[
|
||||
{ "exec": "././beta-tx",
|
||||
{ "exec": "././elements-tx",
|
||||
"args": ["-create", "nversion=1"],
|
||||
"output_cmp": "blanktxv1.hex",
|
||||
"description": "Creates a blank v1 transaction"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-json","-create", "nversion=1"],
|
||||
"output_cmp": "blanktxv1.json",
|
||||
"description": "Creates a blank v1 transaction (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-"],
|
||||
"input": "blanktxv2.hex",
|
||||
"output_cmp": "blanktxv2.hex",
|
||||
|
|
@ -20,57 +20,57 @@
|
|||
"output_cmp": "blanktxv2.json",
|
||||
"description": "Creates a blank transaction (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-json","-"],
|
||||
"input": "blanktxv2.hex",
|
||||
"output_cmp": "blanktxv2.json",
|
||||
"description": "Creates a blank transaction when nothing is piped into bitcoin-tx (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-", "delin=1"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"output_cmp": "tt-delin1-out.hex",
|
||||
"description": "Deletes a single input from a transaction"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-json", "-", "delin=1"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"output_cmp": "tt-delin1-out.json",
|
||||
"description": "Deletes a single input from a transaction (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-", "delin=31"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"return_code": 1,
|
||||
"error_txt": "error: Invalid TX input index '31'",
|
||||
"description": "Attempts to delete an input with a bad index from a transaction. Expected to fail."
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-", "delout=1"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"output_cmp": "tt-delout1-out.hex",
|
||||
"description": "Deletes a single output from a transaction"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-json", "-", "delout=1"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"output_cmp": "tt-delout1-out.json",
|
||||
"description": "Deletes a single output from a transaction (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-", "delout=2"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"return_code": 1,
|
||||
"error_txt": "error: Invalid TX output index '2'",
|
||||
"description": "Attempts to delete an output with a bad index from a transaction. Expected to fail."
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-", "locktime=317000"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"output_cmp": "tt-locktime317000-out.hex",
|
||||
"description": "Adds an nlocktime to a transaction"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-json", "-", "locktime=317000"],
|
||||
"input": "tx394b54bb.hex",
|
||||
"output_cmp": "tt-locktime317000-out.json",
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
"error_txt": "error: TX output missing or too many separators",
|
||||
"description": "Malformed outpubkey argument (too many separators). Expected to fail."
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
"output_cmp": "txcreate1.hex",
|
||||
"description": "Creates a new transaction with three inputs and two outputs"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-json",
|
||||
"-create",
|
||||
|
|
@ -131,12 +131,12 @@
|
|||
"output_cmp": "txcreate1.json",
|
||||
"description": "Creates a new transaction with three inputs and two outputs (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-create", "outscript=0:"],
|
||||
"output_cmp": "txcreate2.hex",
|
||||
"description": "Creates a new transaction with a single empty output script"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args": ["-json", "-create", "outscript=0:"],
|
||||
"output_cmp": "txcreate2.json",
|
||||
"description": "Creates a new transaction with a single empty output script (output in json)"
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
"output_cmp": "txcreatescript4.json",
|
||||
"description": "Create a new transaction with a single output script (OP_DROP) in a P2SH, wrapped in a P2SH (output as json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create", "nversion=1",
|
||||
"in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
"output_cmp": "txcreatesignv1.hex",
|
||||
"description": "Creates a new v1 transaction with a single input and a single output, and then signs the transaction"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-json",
|
||||
"-create", "nversion=1",
|
||||
|
|
@ -261,7 +261,7 @@
|
|||
"output_cmp": "txcreateoutpubkey3.json",
|
||||
"description": "Creates a new transaction with a single pay-to-pub-key output, wrapped in P2SH (output as json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
|
||||
|
|
@ -270,7 +270,7 @@
|
|||
"error_txt": "error: invalid TX output data",
|
||||
"description": "Attempts to create a new transaction with one input and an output with malformed hex data. Expected to fail"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
|
||||
|
|
@ -279,7 +279,7 @@
|
|||
"error_txt": "error: invalid TX output data",
|
||||
"description": "Attempts to create a new transaction with one input and an output with no value and malformed hex data. Expected to fail"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
|
||||
|
|
@ -288,7 +288,7 @@
|
|||
"output_cmp": "txcreatedata1.hex",
|
||||
"description": "Creates a new transaction with one input, one address output and one data output"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-json",
|
||||
"-create", "nversion=1",
|
||||
|
|
@ -298,7 +298,7 @@
|
|||
"output_cmp": "txcreatedata1.json",
|
||||
"description": "Creates a new v1 transaction with one input, one address output and one data output (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
|
||||
|
|
@ -307,7 +307,7 @@
|
|||
"output_cmp": "txcreatedata2.hex",
|
||||
"description": "Creates a new transaction with one input, one address output and one data (zero value) output"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-json",
|
||||
"-create",
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
"output_cmp": "txcreatedata2.json",
|
||||
"description": "Creates a new transaction with one input, one address output and one data (zero value) output (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-create",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293",
|
||||
|
|
@ -325,7 +325,7 @@
|
|||
"output_cmp": "txcreatedata_seq0.hex",
|
||||
"description": "Creates a new transaction with one input with sequence number and one address output"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-json",
|
||||
"-create",
|
||||
|
|
@ -334,14 +334,14 @@
|
|||
"output_cmp": "txcreatedata_seq0.json",
|
||||
"description": "Creates a new transaction with one input with sequence number and one address output (output in json)"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
|
||||
"in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"],
|
||||
"output_cmp": "txcreatedata_seq1.hex",
|
||||
"description": "Adds a new input with sequence number to a transaction"
|
||||
},
|
||||
{ "exec": "./beta-tx",
|
||||
{ "exec": "./elements-tx",
|
||||
"args":
|
||||
["-json",
|
||||
"01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000",
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ namespace boost {
|
|||
|
||||
using namespace std;
|
||||
|
||||
const char * const BITCOIN_CONF_FILENAME = "beta.conf";
|
||||
const char * const BITCOIN_PID_FILENAME = "beta-daemon.pid";
|
||||
const char * const BITCOIN_CONF_FILENAME = "elements.conf";
|
||||
const char * const BITCOIN_PID_FILENAME = "elements-daemon.pid";
|
||||
|
||||
CCriticalSection cs_args;
|
||||
map<string, string> mapArgs;
|
||||
|
|
|
|||
|
|
@ -2220,7 +2220,7 @@ UniValue encryptwallet(const JSONRPCRequest& request)
|
|||
// slack space in .dat files; that is bad if the old data is
|
||||
// unencrypted private keys. So:
|
||||
StartShutdown();
|
||||
return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet. The keypool has been flushed and a new HD seed was generated (if you are using HD). You need to make a new backup.";
|
||||
return "wallet encrypted; Elements server stopping, restart to run with encrypted wallet. The keypool has been flushed and a new HD seed was generated (if you are using HD). You need to make a new backup.";
|
||||
}
|
||||
|
||||
UniValue lockunspent(const JSONRPCRequest& request)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue