diff --git a/.gitignore b/.gitignore index 8e057b8f6d..1ef0cd9291 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ *.tar.gz *.exe -src/beta -src/betad -src/beta-cli -src/beta-tx -src/test/test_beta -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 # 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 diff --git a/Makefile.am b/Makefile.am index bcd11aa16a..74c03d388e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,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) $< $@ @@ -93,7 +93,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) >$@ @@ -111,7 +111,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 @@ -126,7 +126,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) diff --git a/configure.ac b/configure.ac index 85892fb23e..e39651238d 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2016) -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/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/contrib/debian/watch b/contrib/debian/watch index 4d9e0cfa57..42919233fe 100644 --- a/contrib/debian/watch +++ b/contrib/debian/watch @@ -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 diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 9e6f34779b..b6c151d5de 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -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" diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index 26a3b65f8b..1b58c5f9f6 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -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} diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 8bea02a1c0..5d1da29d9b 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -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" diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 3cae998af4..41e2777bf9 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -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 diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 59cf2f2d92..2606eeb164 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -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 diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 4115257472..2d75054f6f 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -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`. diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index ecb43072bb..5ed5381eb5 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -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 diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index 2b104f02fd..3491d6c53a 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Beta-Qt.app + Elements-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index c25d34fd70..916388dc41 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -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 +") diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index 65bd11137c..c1c6c6a324 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -10,7 +10,7 @@ # spendfrom.py # Lists available funds # spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # -# Assumes it will talk to a betad or Beta-Qt running +# Assumes it will talk to a elementsd or Elements-Qt running # on localhost. # # Depends on jsonrpc @@ -44,7 +44,7 @@ def determine_db_dir(): return os.path.expanduser("~/.bitcoin") def read_bitcoin_config(dbdir): - """Read the beta.conf file from dbdir, returns dictionary of settings""" + """Read the elements.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -62,11 +62,11 @@ def read_bitcoin_config(dbdir): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "beta.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "elements.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a beta JSON-RPC server""" + """Connect to a elements JSON-RPC server""" testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: @@ -75,7 +75,7 @@ def connect_JSON(config): try: result = ServiceProxy(connect) # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, - # but also make sure the betad we're talking to is/isn't testnet: + # but also make sure the elementsd we're talking to is/isn't testnet: if result.getmininginfo()['testnet'] != testnet: sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.exit(1) diff --git a/doc/README.md b/doc/README.md index bc6d15232f..469ffe06a7 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,5 +1,5 @@ -Sidechain Elements 0.13.1 -===================== +Elements 0.13.1 +=============== Setup --------------------- @@ -13,16 +13,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? diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 06c532dc94..34a94428ec 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -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; diff --git a/doc/build-osx.md b/doc/build-osx.md index 93af37aee5..eb7513fc7e 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -20,10 +20,10 @@ Dependencies 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 @@ -49,7 +49,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. @@ -57,18 +57,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 ------------------------ diff --git a/doc/build-unix.md b/doc/build-unix.md index 8165f26dc2..67aba2a12c 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -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 --------------------- @@ -104,7 +104,7 @@ ZMQ dependencies: 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`. @@ -121,7 +121,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 @@ -144,7 +144,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%. diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 0a28c50aba..4631983e8a 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -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 "BITCOINCLI" not in os.environ: os.environ["BITCOINCLI"] = BUILDDIR + '/src/bitcoin-cli' + EXEEXT diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py index 2b4359325b..faf9bf28cc 100755 --- a/qa/rpc-tests/keypool.py +++ b/qa/rpc-tests/keypool.py @@ -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) diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py index 4e204d938f..7e09d5b705 100755 --- a/qa/rpc-tests/maxblocksinflight.py +++ b/qa/rpc-tests/maxblocksinflight.py @@ -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): diff --git a/qa/rpc-tests/maxuploadtarget.py b/qa/rpc-tests/maxuploadtarget.py index 1ff244cb68..ddb82d13cc 100755 --- a/qa/rpc-tests/maxuploadtarget.py +++ b/qa/rpc-tests/maxuploadtarget.py @@ -83,7 +83,7 @@ class MaxUploadTest(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): diff --git a/qa/rpc-tests/multi_rpc.py b/qa/rpc-tests/multi_rpc.py index 09dac86df4..7a7a9f5da8 100755 --- a/qa/rpc-tests/multi_rpc.py +++ b/qa/rpc-tests/multi_rpc.py @@ -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") diff --git a/qa/rpc-tests/p2p-acceptblock.py b/qa/rpc-tests/p2p-acceptblock.py index d3dcbdeb5f..749edec484 100755 --- a/qa/rpc-tests/p2p-acceptblock.py +++ b/qa/rpc-tests/p2p-acceptblock.py @@ -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): diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 92a51e7b9f..64db3ac788 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -199,10 +199,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): diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index e7b44a00c1..4ad08ac67b 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -157,7 +157,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") @@ -224,7 +224,7 @@ def initialize_chain(test_dir, num_nodes): # Create cache directories, run bitcoinds: for i in range(MAX_NODES): datadir=initialize_datadir("cache", 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) @@ -310,7 +310,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) @@ -343,7 +343,7 @@ def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=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: diff --git a/share/certs/PrivateKeyNotes.md b/share/certs/PrivateKeyNotes.md index 377580e3b0..e2d5ebc416 100644 --- a/share/certs/PrivateKeyNotes.md +++ b/share/certs/PrivateKeyNotes.md @@ -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 diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index c9a48495ce..b83bf22757 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -29,16 +29,16 @@ ???? CFBundleExecutable - Beta-Qt + Elements-Qt CFBundleName - Beta-Qt + Elements-Qt LSHasLocalizedDisplayName CFBundleIdentifier - org.elementsproject.Beta-Qt + org.elementsproject.Elements-Qt CFBundleURLTypes @@ -46,10 +46,10 @@ CFBundleTypeRole Editor CFBundleURLName - org.elementsproject.BetaPayment + org.elementsproject.ElementsPayment CFBundleURLSchemes - beta + elements @@ -60,7 +60,7 @@ UTTypeIdentifier org.elementsproject.paymentrequest UTTypeDescription - Beta payment request + Elements payment request UTTypeConformsTo public.data @@ -68,10 +68,10 @@ UTTypeTagSpecification public.mime-type - application/x-beta-payment-request + application/x-elements-payment-request public.filename-extension - betapaymentrequest + elementspaymentrequest diff --git a/src/Makefile.am b/src/Makefile.am index 3aae57bc61..12f1c5264c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,7 +33,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 @@ -61,11 +61,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 @@ -349,16 +349,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) \ @@ -371,38 +371,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) \ @@ -410,22 +410,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 # @@ -463,7 +463,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) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index ec379fcce0..26b1b29d86 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -1,4 +1,4 @@ -bin_PROGRAMS += qt/beta-qt +bin_PROGRAMS += qt/elements-qt EXTRA_LIBRARIES += qt/libbitcoinqt.a # bitcoin qt core # @@ -367,7 +367,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. @@ -375,29 +375,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) @@ -428,10 +428,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) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index a3eee16788..b15973bdc5 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -1,5 +1,5 @@ -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_uritests.cpp @@ -12,42 +12,42 @@ 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/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) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 52dff5e1e3..cdae765146 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -1,7 +1,7 @@ -TESTS += test/test_beta -bin_PROGRAMS += test/test_beta +TESTS += test/test_elements +bin_PROGRAMS += test/test_elements TEST_SRCDIR = test -TEST_BINARY=test/test_beta$(EXEEXT) +TEST_BINARY=test/test_elements$(EXEEXT) EXTRA_DIST += \ @@ -104,23 +104,23 @@ BITCOIN_TESTS += \ wallet/test/rpc_wallet_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) -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) -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 -nodist_test_test_beta_SOURCES = $(GENERATED_TEST_FILES) +nodist_test_test_elements_SOURCES = $(GENERATED_TEST_FILES) $(BITCOIN_TESTS): $(GENERATED_TEST_FILES) @@ -131,13 +131,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..." diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index cb880e5ace..0dbbe541b4 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -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 diff --git a/src/bitcoin-tx-res.rc b/src/bitcoin-tx-res.rc index d76385a6a7..bf1bdb2eab 100644 --- a/src/bitcoin-tx-res.rc +++ b/src/bitcoin-tx-res.rc @@ -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 diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 742fa7c8a4..3293a8f006 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -55,10 +55,10 @@ static bool AppInitRawTx(int argc, char* argv[]) if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-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] [commands] " + _("Update hex-encoded bitcoin transaction") + "\n" + - " beta-tx [options] -create [commands] " + _("Create hex-encoded bitcoin transaction") + "\n" + + " elements-tx [options] [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()); diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index 4de92f28d6..4236965401 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -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 diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index a87a47748c..2b27678782 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -87,7 +87,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); } @@ -126,14 +126,14 @@ 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(1); } #ifndef WIN32 fDaemon = GetBoolArg("-daemon", false); if (fDaemon) { - fprintf(stdout, "Bitcoin server starting\n"); + fprintf(stdout, "Elements server starting\n"); // Daemonize pid_t pid = fork(); diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 62176fdd18..ac155f7203 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -55,7 +55,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi } /** - * Elements Beta. + * Elements Core. */ class CElementsParams : public CChainParams { public: diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index b2192329b3..30f0f7e272 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -9,8 +9,8 @@ #include #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) diff --git a/src/qt/Makefile b/src/qt/Makefile index 42128d5fad..98647296ec 100644 --- a/src/qt/Makefile +++ b/src/qt/Makefile @@ -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 diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 97f0e6311f..03faa6338a 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -242,9 +242,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
"), QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish hash transaction in
"), QT_TRANSLATE_NOOP("bitcoin-core", "Enable publish raw block in
"), @@ -332,7 +332,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", "This is experimental software."), QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"), diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 4a018b2cf5..2d9bfa34f5 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -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 diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 7d9ae023ae..c8ca1595ab 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -747,7 +747,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"; diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm index 8a6aeb187a..8caf5f18ae 100644 --- a/src/qt/macnotificationhandler.mm +++ b/src/qt/macnotificationhandler.mm @@ -13,7 +13,7 @@ - (NSString *)__bundleIdentifier { if (self == [NSBundle mainBundle]) { - return @"org.elementsproject.Beta-Qt"; + return @"org.elementsproject.Elements-Qt"; } else { return [self __bundleIdentifier]; } diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 760ffc9f6f..35b9f27178 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -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 diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index bfb3cbaed2..39af1a0689 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -36,7 +36,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(); diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index a5692b4e74..2f80701c9b 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -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(); diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 5c303deed2..4bbc039fea 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -262,11 +262,11 @@ UniValue stop(const UniValue& params, bool fHelp) if (fHelp || 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"; } /** diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index df8d8884c9..a614392bb6 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -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; } diff --git a/src/test/data/bitcoin-util-test.json b/src/test/data/bitcoin-util-test.json index ba7ee596c2..b671d8428b 100644 --- a/src/test/data/bitcoin-util-test.json +++ b/src/test/data/bitcoin-util-test.json @@ -1,63 +1,63 @@ [ - { "exec": "././beta-tx", + { "exec": "././elements-tx", "args": ["-create"], "output_cmp": "blanktx.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json","-create"], "output_cmp": "blanktx.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-"], "input": "blanktx.hex", "output_cmp": "blanktx.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json","-"], "input": "blanktx.hex", "output_cmp": "blanktx.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-", "delin=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delin1-out.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-", "delin=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delin1-out.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-", "delin=31"], "input": "tx394b54bb.hex", "return_code": 1 }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-", "delout=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delout1-out.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-", "delout=1"], "input": "tx394b54bb.hex", "output_cmp": "tt-delout1-out.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-", "delout=2"], "input": "tx394b54bb.hex", "return_code": 1 }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-", "locktime=317000"], "input": "tx394b54bb.hex", "output_cmp": "tt-locktime317000-out.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-", "locktime=317000"], "input": "tx394b54bb.hex", "output_cmp": "tt-locktime317000-out.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", @@ -67,7 +67,7 @@ "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"], "output_cmp": "txcreate1.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-create", @@ -78,15 +78,15 @@ "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"], "output_cmp": "txcreate1.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "outscript=0:"], "output_cmp": "txcreate2.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-create", "outscript=0:"], "output_cmp": "txcreate2.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0", @@ -96,7 +96,7 @@ "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"], "output_cmp": "txcreatesign.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-create", @@ -107,21 +107,21 @@ "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"], "output_cmp": "txcreatesign.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", "outdata=4:badhexdata"], "return_code": 1 }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", "outdata=badhexdata"], "return_code": 1 }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", @@ -129,7 +129,7 @@ "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata1.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-create", @@ -138,7 +138,7 @@ "outdata=4:54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata1.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0", @@ -146,7 +146,7 @@ "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata2.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-create", @@ -155,14 +155,14 @@ "outdata=54686973204f505f52455455524e207472616e73616374696f6e206f7574707574207761732063726561746564206279206d6f646966696564206372656174657261777472616e73616374696f6e2e"], "output_cmp": "txcreatedata2.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-create", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:4294967293", "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"], "output_cmp": "txcreatedata_seq0.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "-create", @@ -170,13 +170,13 @@ "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o"], "output_cmp": "txcreatedata_seq0.json" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000", "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0:1"], "output_cmp": "txcreatedata_seq1.hex" }, - { "exec": "./beta-tx", + { "exec": "./elements-tx", "args": ["-json", "01000000011f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000fdffffff0180a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac00000000", diff --git a/src/util.cpp b/src/util.cpp index 555e29dfdd..0a2ca99f0c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -100,8 +100,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"; map mapArgs; map > mapMultiArgs; diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1fffa96bb9..bc14f3f078 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2165,7 +2165,7 @@ UniValue encryptwallet(const UniValue& params, bool fHelp) // 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 UniValue& params, bool fHelp)