From c825c2ef81654bb2ce7e42fa513c327545eb4b85 Mon Sep 17 00:00:00 2001 From: Ray Engelking Date: Fri, 5 Jan 2018 08:25:00 -0500 Subject: [PATCH] contrib folder updated to FLO; also updated to new floblockchain/flo.git git urls everywhere --- README.md | 2 +- configure.ac | 2 +- contrib/README.md | 14 +- contrib/devtools/gen-manpages.sh | 12 +- contrib/gitian-build.sh | 62 ++--- contrib/gitian-descriptors/README.md | 4 +- contrib/gitian-descriptors/gitian-linux.yml | 18 +- .../gitian-descriptors/gitian-osx-signer.yml | 10 +- contrib/gitian-descriptors/gitian-osx.yml | 12 +- .../gitian-descriptors/gitian-win-signer.yml | 8 +- contrib/gitian-descriptors/gitian-win.yml | 16 +- contrib/linearize/README.md | 8 +- contrib/linearize/example-linearize.cfg | 14 +- contrib/macdeploy/README.md | 2 +- contrib/macdeploy/custom_dsstore.py | 6 +- contrib/macdeploy/detached-sig-create.sh | 2 +- contrib/macdeploy/fancy.plist | 2 +- contrib/macdeploy/macdeployqtplus | 4 +- contrib/qos/README.md | 4 +- contrib/qos/tc.sh | 8 +- contrib/seeds/README.md | 2 +- contrib/seeds/generate-seeds.py | 6 +- contrib/seeds/makeseeds.py | 2 +- contrib/seeds/nodes_main.txt | 220 ------------------ contrib/seeds/nodes_test.txt | 15 -- contrib/testgen/README.md | 2 +- contrib/testgen/gen_base58_test_vectors.py | 8 +- contrib/tidy_datadir.sh | 12 +- doc/README_osx.md | 2 +- doc/build-osx.md | 2 +- doc/build-unix.md | 2 +- doc/gitian-building.md | 10 +- .../release-notes-0.13.2.md | 2 +- doc/man/litecoin-cli.1 | 2 +- doc/man/litecoin-qt.1 | 2 +- doc/man/litecoin-tx.1 | 2 +- doc/man/litecoind.1 | 2 +- doc/release-notes-litecoin.md | 4 +- doc/release-process.md | 12 +- src/init.cpp | 2 +- 40 files changed, 143 insertions(+), 378 deletions(-) delete mode 100644 contrib/seeds/nodes_main.txt delete mode 100644 contrib/seeds/nodes_test.txt diff --git a/README.md b/README.md index ad95a1d58..59b174db2 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Development Process ------------------- The `master` branch is regularly built and tested, but is not guaranteed to be -completely stable. [Tags](https://github.com/litecoin-project/litecoin/tags) are created +completely stable. [Tags](https://github.com/floblockchain/flo/tags) are created regularly to indicate new official, stable release versions of Litecoin Core. The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md). diff --git a/configure.ac b/configure.ac index 956805d49..dad1c7a4a 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2017) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Litecoin Core]]) -AC_INIT([Litecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/litecoin-project/litecoin/issues],[litecoin],[https://litecoin.org/]) +AC_INIT([Litecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/floblockchain/flo/issues],[litecoin],[https://litecoin.org/]) AC_CONFIG_SRCDIR([src/validation.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/contrib/README.md b/contrib/README.md index b01ea2ca9..ee3e83b5e 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain. ### [Qos](/contrib/qos) ### -A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Litecoin network. This means one can have an always-on litecoind instance running, and another local litecoind/litecoin-qt instance which connects to this node and receives blocks from it. +A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the FLO network. This means one can have an always-on flod instance running, and another local flod/flo-qt instance which connects to this node and receives blocks from it. ### [Seeds](/contrib/seeds) ### Utility to generate the pnSeed[] array that is compiled into the client. @@ -22,20 +22,20 @@ Build Tools and Keys --------------------- ### [Debian](/contrib/debian) ### -Contains files used to package litecoind/litecoin-qt -for Debian-based Linux systems. If you compile litecoind/litecoin-qt yourself, there are some useful files here. +Contains files used to package flod/flo-qt +for Debian-based Linux systems. If you compile flod/flo-qt yourself, there are some useful files here. ### [Gitian-descriptors](/contrib/gitian-descriptors) ### Notes on getting Gitian builds up and running using KVM. ### [Gitian-keys](/contrib/gitian-keys) -PGP keys used for signing Litecoin Core [Gitian release](/doc/release-process.md) results. +PGP keys used for signing FLO Core [Gitian release](/doc/release-process.md) results. ### [MacDeploy](/contrib/macdeploy) ### Scripts and notes for Mac builds. ### [RPM](/contrib/rpm) ### -RPM spec file for building litecoin-core on RPM based distributions +RPM spec file for building flo-core on RPM based distributions ### [Gitian-build](/contrib/gitian-build.sh) ### Script for running full Gitian builds. @@ -44,7 +44,7 @@ Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### -Utilities to generate test vectors for the data-driven Litecoin tests. +Utilities to generate test vectors for the data-driven FLO tests. ### [Verify Binaries](/contrib/verifybinaries) ### -This script attempts to download and verify the signature file SHA256SUMS.asc from litecoin.org. +This script attempts to download and verify the signature file SHA256SUMS.asc from flo.org. diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 41839b542..ae31e0713 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,15 +4,15 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -BITCOIND=${BITCOIND:-$SRCDIR/litecoind} -BITCOINCLI=${BITCOINCLI:-$SRCDIR/litecoin-cli} -BITCOINTX=${BITCOINTX:-$SRCDIR/litecoin-tx} -BITCOINQT=${BITCOINQT:-$SRCDIR/qt/litecoin-qt} +BITCOIND=${BITCOIND:-$SRCDIR/flod} +BITCOINCLI=${BITCOINCLI:-$SRCDIR/flo-cli} +BITCOINTX=${BITCOINTX:-$SRCDIR/flo-tx} +BITCOINQT=${BITCOINQT:-$SRCDIR/qt/flo-qt} -[ ! -x $BITCOIND ] && echo "$LITECOIND not found or not executable." && exit 1 +[ ! -x $BITCOIND ] && echo "$FLOD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -BTCVER=($($LITECOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) +BTCVER=($($FLOCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) # Create a footer file with copyright content. # This gets autodetected fine for bitcoind if --version-string is not set, diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index d43ec9b1e..52e5ae16e 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -17,7 +17,7 @@ osx=true SIGNER= VERSION= commit=false -url=https://github.com/litecoin-project/litecoin +url=https://github.com/floblockchain/flo proc=2 mem=2000 lxc=true @@ -31,7 +31,7 @@ commitFiles=true read -d '' usage <<- EOF Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version -Run this script from the directory containing the litecoin, gitian-builder, gitian.sigs.ltc, and litecoin-detached-sigs. +Run this script from the directory containing the flo, gitian-builder, gitian.sigs.flo, and flo-detached-sigs. Arguments: signer GPG signer to sign each build assert file @@ -39,7 +39,7 @@ version Version number, commit, or branch to build. If building a commit or bra Options: -c|--commit Indicate that the version argument is for a commit or branch --u|--url Specify the URL of the repository. Default is https://github.com/litecoin-project/litecoin +-u|--url Specify the URL of the repository. Default is https://github.com/floblockchain/flo -v|--verify Verify the gitian build -b|--build Do a gitian build -s|--sign Make signed binaries for Windows and Mac OSX @@ -232,8 +232,8 @@ echo ${COMMIT} if [[ $setup = true ]] then sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils - git clone https://github.com/litecoin-project/gitian.sigs.ltc.git - git clone https://github.com/litecoin-project/litecoin-detached-sigs.git + git clone https://github.com/floblockchain/gitian.sigs.flo.git + git clone https://github.com/floblockchain/flo-detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git pushd ./gitian-builder if [[ -n "$USE_LXC" ]] @@ -247,7 +247,7 @@ then fi # Set up build -pushd ./litecoin +pushd ./flo git fetch git checkout ${COMMIT} popd @@ -256,7 +256,7 @@ popd if [[ $build = true ]] then # Make output folder - mkdir -p ./litecoin-binaries/${VERSION} + mkdir -p ./flo-binaries/${VERSION} # Build Dependencies echo "" @@ -266,7 +266,7 @@ then mkdir -p inputs wget -N -P inputs $osslPatchUrl wget -N -P inputs $osslTarUrl - make -C ../litecoin/depends download SOURCES_PATH=`pwd`/cache/common + make -C ../flo/depends download SOURCES_PATH=`pwd`/cache/common # Linux if [[ $linux = true ]] @@ -274,9 +274,9 @@ then echo "" echo "Compiling ${VERSION} Linux" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit litecoin=${COMMIT} --url litecoin=${url} ../litecoin/contrib/gitian-descriptors/gitian-linux.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-linux.yml - mv build/out/litecoin-*.tar.gz build/out/src/litecoin-*.tar.gz ../litecoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit flo=${COMMIT} --url flo=${url} ../flo/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs.flo/ ../flo/contrib/gitian-descriptors/gitian-linux.yml + mv build/out/flo-*.tar.gz build/out/src/flo-*.tar.gz ../flo-binaries/${VERSION} fi # Windows if [[ $windows = true ]] @@ -284,10 +284,10 @@ then echo "" echo "Compiling ${VERSION} Windows" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit litecoin=${COMMIT} --url litecoin=${url} ../litecoin/contrib/gitian-descriptors/gitian-win.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-win.yml - mv build/out/litecoin-*-win-unsigned.tar.gz inputs/litecoin-win-unsigned.tar.gz - mv build/out/litecoin-*.zip build/out/litecoin-*.exe ../litecoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit flo=${COMMIT} --url flo=${url} ../flo/contrib/gitian-descriptors/gitian-win.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs.flo/ ../flo/contrib/gitian-descriptors/gitian-win.yml + mv build/out/flo-*-win-unsigned.tar.gz inputs/flo-win-unsigned.tar.gz + mv build/out/flo-*.zip build/out/flo-*.exe ../flo-binaries/${VERSION} fi # Mac OSX if [[ $osx = true ]] @@ -295,10 +295,10 @@ then echo "" echo "Compiling ${VERSION} Mac OSX" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit litecoin=${COMMIT} --url litecoin=${url} ../litecoin/contrib/gitian-descriptors/gitian-osx.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-osx.yml - mv build/out/litecoin-*-osx-unsigned.tar.gz inputs/litecoin-osx-unsigned.tar.gz - mv build/out/litecoin-*.tar.gz build/out/litecoin-*.dmg ../litecoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit flo=${COMMIT} --url flo=${url} ../flo/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs.flo/ ../flo/contrib/gitian-descriptors/gitian-osx.yml + mv build/out/flo-*-osx-unsigned.tar.gz inputs/flo-osx-unsigned.tar.gz + mv build/out/flo-*.tar.gz build/out/flo-*.dmg ../flo-binaries/${VERSION} fi popd @@ -325,27 +325,27 @@ then echo "" echo "Verifying v${VERSION} Linux" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-linux ../litecoin/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gverify -v -d ../gitian.sigs.flo/ -r ${VERSION}-linux ../flo/contrib/gitian-descriptors/gitian-linux.yml # Windows echo "" echo "Verifying v${VERSION} Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-win-unsigned ../litecoin/contrib/gitian-descriptors/gitian-win.yml + ./bin/gverify -v -d ../gitian.sigs.flo/ -r ${VERSION}-win-unsigned ../flo/contrib/gitian-descriptors/gitian-win.yml # Mac OSX echo "" echo "Verifying v${VERSION} Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-unsigned ../litecoin/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gverify -v -d ../gitian.sigs.flo/ -r ${VERSION}-osx-unsigned ../flo/contrib/gitian-descriptors/gitian-osx.yml # Signed Windows echo "" echo "Verifying v${VERSION} Signed Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-signed ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs.flo/ -r ${VERSION}-osx-signed ../flo/contrib/gitian-descriptors/gitian-osx-signer.yml # Signed Mac OSX echo "" echo "Verifying v${VERSION} Signed Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-signed ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs.flo/ -r ${VERSION}-osx-signed ../flo/contrib/gitian-descriptors/gitian-osx-signer.yml popd fi @@ -360,10 +360,10 @@ then echo "" echo "Signing ${VERSION} Windows" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../litecoin/contrib/gitian-descriptors/gitian-win-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-win-signer.yml - mv build/out/litecoin-*win64-setup.exe ../litecoin-binaries/${VERSION} - mv build/out/litecoin-*win32-setup.exe ../litecoin-binaries/${VERSION} + ./bin/gbuild -i --commit signature=${COMMIT} ../flo/contrib/gitian-descriptors/gitian-win-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs.flo/ ../flo/contrib/gitian-descriptors/gitian-win-signer.yml + mv build/out/flo-*win64-setup.exe ../flo-binaries/${VERSION} + mv build/out/flo-*win32-setup.exe ../flo-binaries/${VERSION} fi # Sign Mac OSX if [[ $osx = true ]] @@ -371,9 +371,9 @@ then echo "" echo "Signing ${VERSION} Mac OSX" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/litecoin-osx-signed.dmg ../litecoin-binaries/${VERSION}/litecoin-${VERSION}-osx.dmg + ./bin/gbuild -i --commit signature=${COMMIT} ../flo/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs.flo/ ../flo/contrib/gitian-descriptors/gitian-osx-signer.yml + mv build/out/flo-osx-signed.dmg ../flo-binaries/${VERSION}/flo-${VERSION}-osx.dmg fi popd diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 7b76ba37e..bc26c3b72 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -19,7 +19,7 @@ Sanity checks: Once you've got the right hardware and software: - git clone git://github.com/litecoin-project/litecoin.git + git clone git://github.com/floblockchain/flo.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs cd gitian-builder/inputs @@ -61,5 +61,5 @@ Here's a description of Gavin's setup on OSX 10.6: 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above: export USE_LXC=1 - git clone git://github.com/litecoin-project/litecoin.git + git clone git://github.com/floblockchain/flo.git ... etc diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 99196054d..caec8ae04 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-linux-0.15" +name: "flo-linux-0.15" enable_cache: true suites: - "trusty" @@ -28,8 +28,8 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/litecoin-project/litecoin.git" - "dir": "litecoin" +- "url": "https://github.com/floblockchain/flo.git" + "dir": "flo" files: [] script: | @@ -113,7 +113,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - cd litecoin + cd flo BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -135,13 +135,13 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo litecoin-*.tar.gz` + SOURCEDIST=`echo flo-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find litecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find flo-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) @@ -182,13 +182,13 @@ script: | find . -name "lib*.a" -delete rm -rf ${DISTNAME}/lib/pkgconfig - # Litecoin: Delete libbitcoin from binary distribution for now, see #192 + # FLO: Delete libbitcoin from binary distribution for now, see #192 rm -rf ${DISTNAME}/lib/ rm -rf ${DISTNAME}/include/ - # Litecoin: ends + # FLO: ends find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; - #find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; # Litecoin: see issue 192 + #find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; # FLO: see issue 192 find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz cd ../../ diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index 784583473..4aad14754 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-dmg-signer" +name: "flo-dmg-signer" suites: - "trusty" architectures: @@ -7,10 +7,10 @@ architectures: packages: - "faketime" remotes: -- "url": "https://github.com/litecoin-project/litecoin-detached-sigs.git" +- "url": "https://github.com/floblockchain/flo-detached-sigs.git" "dir": "signature" files: -- "litecoin-osx-unsigned.tar.gz" +- "flo-osx-unsigned.tar.gz" script: | WRAP_DIR=$HOME/wrapped mkdir -p ${WRAP_DIR} @@ -27,8 +27,8 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=litecoin-osx-unsigned.tar.gz - SIGNED=litecoin-osx-signed.dmg + UNSIGNED=flo-osx-unsigned.tar.gz + SIGNED=flo-osx-signed.dmg tar -xf ${UNSIGNED} OSX_VOLNAME="$(cat osx_volname)" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 2abaddc92..1493ec080 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-osx-0.15" +name: "flo-osx-0.15" enable_cache: true suites: - "trusty" @@ -28,8 +28,8 @@ packages: - "python-setuptools" - "fonts-tuffy" remotes: -- "url": "https://github.com/litecoin-project/litecoin.git" - "dir": "litecoin" +- "url": "https://github.com/floblockchain/flo.git" + "dir": "flo" 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 litecoin + cd flo 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 litecoin-*.tar.gz` + SOURCEDIST=`echo flo-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find litecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find flo-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 331bf8976..4c484704c 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-win-signer" +name: "flo-win-signer" suites: - "trusty" architectures: @@ -8,12 +8,12 @@ packages: - "libssl-dev" - "autoconf" remotes: -- "url": "https://github.com/litecoin-project/litecoin-detached-sigs.git" +- "url": "https://github.com/floblockchain/flo-detached-sigs.git" "dir": "signature" files: - "osslsigncode-1.7.1.tar.gz" - "osslsigncode-Backports-to-1.7.1.patch" -- "litecoin-win-unsigned.tar.gz" +- "flo-win-unsigned.tar.gz" script: | BUILD_DIR=`pwd` SIGDIR=${BUILD_DIR}/signature/win @@ -23,7 +23,7 @@ script: | echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c mkdir -p ${UNSIGNED_DIR} - tar -C ${UNSIGNED_DIR} -xf litecoin-win-unsigned.tar.gz + tar -C ${UNSIGNED_DIR} -xf flo-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 d4a9d9f04..32af3b3eb 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-win-0.15" +name: "flo-win-0.15" enable_cache: true suites: - "trusty" @@ -22,8 +22,8 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/litecoin-project/litecoin.git" - "dir": "litecoin" +- "url": "https://github.com/floblockchain/flo.git" + "dir": "flo" 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 litecoin + cd flo 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 litecoin-*.tar.gz` + SOURCEDIST=`echo flo-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find litecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find flo-* | 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 @@ -155,7 +155,7 @@ script: | make deploy make install DESTDIR=${INSTALLPATH} rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe - cp -f litecoin-*setup*.exe $OUTDIR/ + cp -f flo-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete @@ -171,7 +171,7 @@ script: | cp -rf contrib/windeploy $BUILD_DIR cd $BUILD_DIR/windeploy mkdir unsigned - cp $OUTDIR/litecoin-*setup-unsigned.exe unsigned/ + cp $OUTDIR/flo-*setup-unsigned.exe unsigned/ find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 071c13a60..40c69cfc5 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -1,5 +1,5 @@ # Linearize -Construct a linear, no-fork, best version of the Litecoin blockchain. The scripts +Construct a linear, no-fork, best version of the FLO blockchain. The scripts run using Python 3 but are compatible with Python 2. ## Step 1: Download hash list @@ -12,7 +12,7 @@ Required configuration file settings for linearize-hashes: Optional config file setting for linearize-hashes: * RPC: `host` (Default: `127.0.0.1`) -* RPC: `port` (Default: `9332`) +* RPC: `port` (Default: `7312`) * Blockchain: `min_height`, `max_height` * `rev_hash_bytes`: If true, the written block hash list will be byte-reversed. (In other words, the hash returned by getblockhash will have its @@ -21,7 +21,7 @@ standalone hash lists but safe to use with linearize-data.py, which will output the same data no matter which byte format is chosen. The `linearize-hashes` script requires a connection, local or remote, to a -JSON-RPC server. Running `litecoind` or `litecoin-qt -server` will be sufficient. +JSON-RPC server. Running `flod` or `flo-qt -server` will be sufficient. ## Step 2: Copy local block data @@ -39,7 +39,7 @@ will be printed. respectively, to the current time and to the timestamp of the most recent block written to the script's blockchain. * `genesis`: The hash of the genesis block in the blockchain. -* `input`: litecoind blocks/ directory containing blkNNNNN.dat +* `input`: flod blocks/ directory containing blkNNNNN.dat * `hashlist`: text file containing list of block hashes created by linearize-hashes.py. * `max_out_sz`: Maximum size for files created by the `output_file` option. diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 6b026cf0e..e24b634e4 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -1,4 +1,4 @@ -# litecoind RPC settings (linearize-hashes) +# flod RPC settings (linearize-hashes) rpcuser=someuser rpcpassword=somepassword #datadir=~/.bitcoin @@ -12,14 +12,14 @@ max_height=313000 # bootstrap.dat input/output settings (linearize-data) # mainnet -netmagic=fbc0b6db -genesis=12a765e31ffd4059bada1e25190f6e98c99d9714d334efa41a195a7e7e04bfe2 -input=/home/example/.litecoin/blocks +netmagic=f9beb4d9 +genesis=09c7781c9df90708e278c35d38ea5c9041d7ecfcdd1c56ba67274b7cff3e1cea +input=/home/example/.flo/blocks # testnet -#netmagic=fdd2c8f1 -#genesis=4966625a4b2851d9fdee139e56211a0d88575f59ed816ff5e6a63deb4e3e29a0 -#input=/home/example/.litecoin/testnet3/blocks +#netmagic=fdc05af2 +#genesis=9b7bc86236c34b5e3a39367c036b7fe8807a966c22a7a1f0da2a198a27e03731 +#input=/home/example/.flo/testnet3/blocks # "output" option causes blockchain files to be written to the given location, # with "output_file" ignored. If not used, "output_file" is used instead. diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 50cc94d20..b05b53661 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -11,5 +11,5 @@ 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 `Litecoin-Core.dmg`. +When finished, it will produce `FLO-Core.dmg`. diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index c8bb6d1a2..602161202 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -45,8 +45,8 @@ alias = Alias.from_bytes(icvp['backgroundImageAlias']) alias.volume.name = package_name_ns alias.volume.posix_path = '/Volumes/' + package_name_ns alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg' -alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00litecoinuser:\x00Documents:\x00litecoin:\x00litecoin:\x00' + package_name_ns + '.temp.dmg' -alias.volume.disk_image_alias.target.posix_path = 'Users/litecoinuser/Documents/litecoin/litecoin/' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00flouser:\x00Documents:\x00flo:\x00flo:\x00' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.posix_path = 'Users/flouser/Documents/flo/flo/' + package_name_ns + '.temp.dmg' alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff' icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes()) ds['.']['icvp'] = icvp @@ -54,7 +54,7 @@ ds['.']['icvp'] = icvp ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Litecoin-Qt.app']['Iloc'] = (128, 156) +ds['FLO-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index a3fc318b4..3c7fb96a7 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}/Litecoin-Qt.app" +BUNDLE="${ROOTDIR}/FLO-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index 1dd36c9d1..2db4bedfb 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Litecoin-Qt.app + FLO-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 6d4b15ce5..46d90c72b 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 = "Litecoin-Qt" + appName = "FLO-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) @@ -603,7 +603,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Litecoin-Qt.app") +target = os.path.join("dist", "FLO-Qt.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/qos/README.md b/contrib/qos/README.md index d569b6a6f..3b103eb77 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Litecoin network. It limits outbound TCP traffic with a source or destination port of 9333, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the FLO network. It limits outbound TCP traffic with a source or destination port of 9333, but not if the destination IP is within a LAN (defined as 192.168.x.x). -This means one can have an always-on litecoind instance running, and another local litecoind/litecoin-qt instance which connects to this node and receives blocks from it. +This means one can have an always-on flod instance running, and another local flod/flo-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 8f9bb7a8b..0274097c7 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -6,7 +6,7 @@ IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Litecoin protocol traffic to this rate +#limit outbound FLO protocol traffic to this rate LIMIT="160kbit" #defines the address space for which you wish to disable rate limiting LOCALNET="192.168.0.0/16" @@ -36,10 +36,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11 # ret=$? #done -#limit outgoing traffic to and from port 9333. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 7313. but not when dealing with a host on the local network # (defined by $LOCALNET) # --set-mark marks packages matching these criteria with the number "2" # these packages are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9333 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9333 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 7313 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 7313 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 9d2ffe369..b3ddeb7e8 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -8,7 +8,7 @@ and remove old versions as necessary. The seeds compiled into the release are created from poolers's DNS seed data, like this: - curl -s https://www.litecoinpool.org/seeds.txt > seeds_main.txt + curl -s https://www.florincoinpool.org/seeds.txt > seeds_main.txt python3 makeseeds.py < seeds_main.txt > nodes_main.txt python3 generate-seeds.py . > ../../src/chainparamsseeds.h diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index c753491af..c95224301 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -120,17 +120,17 @@ def main(): g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('/**\n') - g.write(' * List of fixed seed nodes for the litecoin network\n') + g.write(' * List of fixed seed nodes for the flo network\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') g.write(' *\n') g.write(' * Each line contains a 16-byte IPv6 address and a port.\n') g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n') g.write(' */\n') with open(os.path.join(indir,'nodes_main.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_main', 9333) + process_nodes(g, f, 'pnSeed6_main', 7313) g.write('\n') with open(os.path.join(indir,'nodes_test.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_test', 19335) + process_nodes(g, f, 'pnSeed6_test', 17313) g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index e0c67ec21..df36569ba 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -30,7 +30,7 @@ import collections PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$") PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$") PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$") -PATTERN_AGENT = re.compile(r"^(/Satoshi:0.13.(0|1|2|99)/|/LitecoinCore:0.13.(0|1|2|99)/|/LitecoinCore:0.14.(0|1|2|99)/)$") +PATTERN_AGENT = re.compile(r"^(/Satoshi:0.13.(0|1|2|99)/|/FLOCore:0.13.(0|1|2|99)/|/FLOCore:0.14.(0|1|2|99)/)$") def parseline(line): sline = line.split() diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt deleted file mode 100644 index abc6bc1a8..000000000 --- a/contrib/seeds/nodes_main.txt +++ /dev/null @@ -1,220 +0,0 @@ -5.39.64.7:9333 -5.45.69.13:9333 -5.100.249.197:9333 -5.228.7.146:9333 -5.255.90.234:9333 -23.28.128.65:9333 -23.94.28.182:9335 -23.236.100.11:9333 -24.214.54.179:10333 -24.220.158.151:9333 -27.96.51.15:9333 -31.131.20.85:9333 -31.165.50.156:9333 -34.193.68.10:9333 -37.24.124.177:9333 -37.61.209.144:9333 -37.143.8.102:28333 -37.157.183.16:9333 -37.221.198.57:9333 -42.51.12.220:9333 -42.51.153.80:8332 -45.55.176.26:9333 -45.63.93.75:9333 -45.76.172.211:9333 -46.23.85.25:9333 -46.32.50.98:9333 -46.166.129.186:9333 -47.54.207.91:9333 -47.55.95.227:9333 -47.88.152.141:9333 -47.90.120.157:9333 -47.93.132.3:9333 -47.187.16.175:9333 -51.7.77.185:9333 -51.15.64.166:9333 -52.7.135.69:9333 -52.63.12.109:9333 -54.149.206.22:18891 -62.106.16.111:9333 -62.106.27.219:9333 -62.112.11.188:9333 -62.152.54.44:9333 -62.232.136.243:9333 -63.224.55.74:9333 -63.231.239.212:9333 -65.70.19.49:9333 -66.172.104.80:9333 -66.196.5.33:9333 -68.63.8.36:9333 -69.175.49.226:9333 -71.120.188.82:9333 -72.135.235.246:9333 -72.180.107.193:9333 -74.77.80.44:9333 -76.12.247.45:9333 -76.92.136.75:9333 -76.169.57.92:9333 -77.77.46.250:9333 -78.31.66.170:9333 -78.58.154.22:9333 -78.158.132.14:9333 -80.237.235.101:9333 -80.237.240.102:9333 -81.4.103.48:9333 -81.27.96.37:9333 -82.192.64.136:9333 -82.208.99.13:9333 -83.78.230.30:9333 -83.83.0.100:9333 -83.162.196.192:9333 -83.212.97.34:9333 -84.50.242.136:9333 -84.215.80.43:9333 -84.234.52.190:37700 -85.21.144.163:9333 -85.21.144.226:9333 -85.25.74.148:9333 -85.25.138.71:9333 -85.105.196.209:9333 -85.143.137.206:9333 -85.194.238.130:9333 -85.234.150.199:9333 -86.14.143.176:9333 -87.79.94.221:9333 -87.236.27.155:9333 -88.84.24.206:10333 -88.87.78.126:9333 -88.196.136.31:9333 -88.202.202.221:9333 -88.208.3.82:9333 -89.22.104.48:9333 -89.22.151.211:9333 -89.98.140.88:9333 -89.212.75.6:9333 -89.252.28.26:9333 -90.177.48.104:9333 -91.109.112.90:9333 -91.109.112.94:9333 -91.152.121.68:9333 -91.205.217.142:9333 -91.226.10.90:9333 -91.228.155.63:9333 -91.240.141.175:9333 -93.100.51.48:9333 -93.190.140.198:9333 -94.31.170.49:9333 -95.174.101.14:9333 -95.211.138.88:9333 -95.213.143.13:9333 -95.213.210.141:9333 -96.42.248.149:9333 -96.127.175.194:9333 -97.81.152.130:9333 -97.107.188.177:9333 -101.100.174.138:9333 -103.3.188.189:9333 -103.7.32.40:9333 -103.80.168.57:9333 -103.82.56.25:9333 -103.250.4.74:41888 -104.35.96.255:9333 -107.150.45.210:9333 -107.155.133.230:9333 -107.182.235.53:9333 -107.197.216.228:9333 -108.59.7.214:9333 -108.59.9.14:9333 -109.61.102.5:9333 -109.111.178.187:10333 -109.169.71.17:9333 -109.201.183.125:9333 -119.9.116.68:9333 -119.28.61.201:9333 -119.28.70.144:9333 -121.14.154.49:9333 -121.42.184.8:9333 -123.1.170.46:9333 -124.190.12.86:9333 -130.240.22.202:9333 -134.119.179.234:9333 -139.59.180.15:9333 -139.162.57.21:9333 -140.186.42.44:9333 -142.4.208.32:9333 -143.89.111.111:9333 -144.76.40.144:9333 -144.172.71.138:9333 -148.251.44.134:9333 -155.4.15.52:9333 -155.207.60.48:9333 -158.129.212.251:9333 -162.213.252.46:9333 -162.221.12.116:10333 -166.70.94.106:9333 -169.44.34.88:9333 -171.25.221.40:9333 -173.51.177.2:9333 -173.79.196.160:9333 -173.80.190.86:9333 -173.209.44.34:9333 -173.255.204.124:9333 -174.49.248.188:9333 -178.15.158.237:9333 -178.20.55.234:9333 -178.155.51.54:9333 -178.238.225.168:9333 -183.111.10.67:9333 -184.164.147.82:21333 -185.8.165.150:10333 -185.21.223.231:9333 -185.50.213.124:9333 -185.103.243.133:9333 -185.106.122.192:9333 -185.141.24.127:9333 -185.163.125.67:9333 -185.194.140.155:9333 -188.182.109.216:9333 -188.214.30.138:9333 -190.112.242.178:9333 -191.101.236.222:9333 -192.3.165.30:9333 -192.187.116.242:9333 -193.33.170.127:9333 -193.46.80.101:9333 -193.58.196.212:9333 -193.146.41.46:9333 -194.24.182.27:9333 -194.63.143.197:9333 -194.79.8.36:10333 -194.79.8.37:10333 -194.135.88.142:9333 -195.3.254.48:9333 -195.132.61.82:9333 -195.166.157.97:9333 -195.169.138.2:9333 -195.225.230.28:10333 -198.48.216.49:9933 -198.98.48.192:9333 -199.204.185.218:9333 -204.111.241.195:9333 -209.41.186.78:9333 -209.73.142.226:9333 -209.126.107.166:9333 -210.56.60.26:9333 -211.22.29.34:19262 -211.149.161.104:9333 -211.149.224.234:9333 -212.1.101.68:10333 -212.47.252.13:9333 -212.93.226.90:9333 -212.160.237.44:9333 -213.136.71.143:9333 -216.164.138.13:9333 -217.20.130.72:9333 -217.112.251.21:9333 -218.161.47.61:9333 -219.113.244.52:9333 -219.117.248.55:9333 -221.141.3.12:9333 -221.141.3.26:9333 diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt deleted file mode 100644 index 10d346e73..000000000 --- a/contrib/seeds/nodes_test.txt +++ /dev/null @@ -1,15 +0,0 @@ -# List of fixed seed nodes for testnet - -45.33.107.92 -45.76.92.84 -47.93.81.84 -66.178.182.35 -78.47.34.228 -94.176.237.167 -98.234.65.112 -104.131.161.171 -104.236.211.206 -104.243.38.34 -108.61.195.151 -138.197.220.217 -173.209.44.34 diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 0858cdb13..8d7fbbd7d 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,6 +1,6 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Litecoin tests. +Utilities to generate test vectors for the data-driven FLO tests. Usage: diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py index b8724a424..505e40441 100755 --- a/contrib/testgen/gen_base58_test_vectors.py +++ b/contrib/testgen/gen_base58_test_vectors.py @@ -18,10 +18,10 @@ import random from binascii import b2a_hex # key types -PUBKEY_ADDRESS = 48 -SCRIPT_ADDRESS = 5 -PUBKEY_ADDRESS_TEST = 111 -SCRIPT_ADDRESS_TEST = 196 +PUBKEY_ADDRESS = 35 +SCRIPT_ADDRESS = 8 +PUBKEY_ADDRESS_TEST = 115 +SCRIPT_ADDRESS_TEST = 198 PRIVKEY = 176 PRIVKEY_TEST = 239 diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh index a802b542a..e6e71d61c 100755 --- a/contrib/tidy_datadir.sh +++ b/contrib/tidy_datadir.sh @@ -7,7 +7,7 @@ if [ -d "$1" ]; then cd "$1" else echo "Usage: $0 " >&2 - echo "Removes obsolete Litecoin database files" >&2 + echo "Removes obsolete FLO database files" >&2 exit 1 fi @@ -19,22 +19,22 @@ if [ -f wallet.dat -a -f peers.dat -a -f chainstate/CURRENT -a -f blocks/index/C case $LEVEL in 0) - echo "Error: no Litecoin datadir detected." + echo "Error: no FLO datadir detected." exit 1 ;; 1) - echo "Detected old Litecoin datadir (before 0.7)." + echo "Detected old FLO datadir (before 0.7)." echo "Nothing to do." exit 0 ;; 2) - echo "Detected Litecoin 0.7 datadir." + echo "Detected FLO 0.7 datadir." ;; 3) - echo "Detected Litecoin pre-0.8 datadir." + echo "Detected FLO pre-0.8 datadir." ;; 4) - echo "Detected Litecoin 0.8 datadir." + echo "Detected FLO 0.8 datadir." ;; esac diff --git a/doc/README_osx.md b/doc/README_osx.md index e2e2ca825..148beef8a 100644 --- a/doc/README_osx.md +++ b/doc/README_osx.md @@ -92,6 +92,6 @@ build process to remain somewhat deterministic. Here's how it works: that have been previously (deterministically) built in order to create a final dmg. - The Apple keyholder uses this unsigned app to create a detached signature, - using the script that is also included there. Detached signatures are available from this [repository](https://github.com/litecoin-project/litecoin-detached-sigs). + using the script that is also included there. Detached signatures are available from this [repository](https://github.com/floblockchain/flo-detached-sigs). - Builders feed the unsigned app + detached signature back into Gitian. It uses the pre-built tools to recombine the pieces into a deterministic dmg. diff --git a/doc/build-osx.md b/doc/build-osx.md index a8141cf60..330e0166c 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -29,7 +29,7 @@ Build Litecoin Core 1. Clone the litecoin source code and cd into `litecoin` - git clone https://github.com/litecoin-project/litecoin + git clone https://github.com/floblockchain/flo cd litecoin 2. Build litecoin-core: diff --git a/doc/build-unix.md b/doc/build-unix.md index 45076f639..4b3dd4497 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -276,7 +276,7 @@ Setup and Build Example: Arch Linux This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux: pacman -S git base-devel boost libevent python - git clone https://github.com/litecoin-project/litecoin.git + git clone https://github.com/floblockchain/flo.git cd litecoin/ ./autogen.sh ./configure --disable-wallet --without-gui --without-miniupnpc diff --git a/doc/gitian-building.md b/doc/gitian-building.md index 5d65b6f2c..b741c36a8 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -314,8 +314,8 @@ Clone the git repositories for litecoin and Gitian. ```bash git clone https://github.com/devrandom/gitian-builder.git -git clone https://github.com/litecoin-project/litecoin -git clone https://github.com/litecoin-project/gitian.sigs.ltc.git +git clone https://github.com/floblockchain/flo +git clone https://github.com/floblockchain/gitian.sigs.ltc.git ``` Setting up the Gitian image @@ -372,7 +372,7 @@ Output from `gbuild` will look something like remote: Total 57959 (delta 0), reused 0 (delta 0), pack-reused 57958 Receiving objects: 100% (57959/57959), 53.76 MiB | 484.00 KiB/s, done. Resolving deltas: 100% (41590/41590), done. - From https://github.com/litecoin-project/litecoin + From https://github.com/floblockchain/flo ... (new tags, new branch etc) --- Building for trusty amd64 --- Stopping target if it is up @@ -448,7 +448,7 @@ Then when building, override the remote URLs that gbuild would otherwise pull fr ```bash cd /some/root/path/ -git clone https://github.com/litecoin-project/litecoin-detached-sigs.git +git clone https://github.com/floblockchain/flo-detached-sigs.git BTCPATH=/some/root/path/litecoin SIGPATH=/some/root/path/litecoin-detached-sigs @@ -480,5 +480,5 @@ Uploading signatures --------------------- After building and signing you can push your signatures (both the `.assert` and `.assert.sig` files) to the -[litecoin-project/gitian.sigs.ltc](https://github.com/litecoin-project/gitian.sigs.ltc/) repository, or if that's not possible create a pull +[litecoin-project/gitian.sigs.ltc](https://github.com/floblockchain/gitian.sigs.ltc/) repository, or if that's not possible create a pull request. You can also mail the files to thrasher (thrasher@addictionsofware.com) and he will commit them. diff --git a/doc/litecoin-release-notes/release-notes-0.13.2.md b/doc/litecoin-release-notes/release-notes-0.13.2.md index 619183a3a..70d9033c3 100644 --- a/doc/litecoin-release-notes/release-notes-0.13.2.md +++ b/doc/litecoin-release-notes/release-notes-0.13.2.md @@ -7,7 +7,7 @@ It is recommended to upgrade to this version. Please report bugs using the issue tracker at github: - + Compatibility ============== diff --git a/doc/man/litecoin-cli.1 b/doc/man/litecoin-cli.1 index 7283c8164..3e53b765b 100644 --- a/doc/man/litecoin-cli.1 +++ b/doc/man/litecoin-cli.1 @@ -83,7 +83,7 @@ Copyright (C) 2011-2017 The Litecoin Core developers Please contribute if you find Litecoin Core useful. Visit for further information about the software. -The source code is available from . +The source code is available from . This is experimental software. Distributed under the MIT software license, see the accompanying file COPYING diff --git a/doc/man/litecoin-qt.1 b/doc/man/litecoin-qt.1 index e3a1e5f26..9ca84869d 100644 --- a/doc/man/litecoin-qt.1 +++ b/doc/man/litecoin-qt.1 @@ -551,7 +551,7 @@ Copyright (C) 2011-2017 The Litecoin Core developers Please contribute if you find Litecoin Core useful. Visit for further information about the software. -The source code is available from . +The source code is available from . This is experimental software. Distributed under the MIT software license, see the accompanying file COPYING diff --git a/doc/man/litecoin-tx.1 b/doc/man/litecoin-tx.1 index 5e0a6b7c0..38127a898 100644 --- a/doc/man/litecoin-tx.1 +++ b/doc/man/litecoin-tx.1 @@ -117,7 +117,7 @@ Copyright (C) 2011-2017 The Litecoin Core developers Please contribute if you find Litecoin Core useful. Visit for further information about the software. -The source code is available from . +The source code is available from . This is experimental software. Distributed under the MIT software license, see the accompanying file COPYING diff --git a/doc/man/litecoind.1 b/doc/man/litecoind.1 index 8de36b1c3..e84e0533a 100644 --- a/doc/man/litecoind.1 +++ b/doc/man/litecoind.1 @@ -530,7 +530,7 @@ Copyright (C) 2011-2017 The Litecoin Core developers Please contribute if you find Litecoin Core useful. Visit for further information about the software. -The source code is available from . +The source code is available from . This is experimental software. Distributed under the MIT software license, see the accompanying file COPYING diff --git a/doc/release-notes-litecoin.md b/doc/release-notes-litecoin.md index 8d7500fa8..0da015ec3 100644 --- a/doc/release-notes-litecoin.md +++ b/doc/release-notes-litecoin.md @@ -10,7 +10,7 @@ and performance improvements, as well as updated translations. Please report bugs using the issue tracker at GitHub: - + To receive security and update notifications, please subscribe to: @@ -95,7 +95,7 @@ Initial Block Download, startup, transaction and block validation much faster: validation. In version 0.15, SHA256 hardware optimization is disabled in release builds by default, but can be enabled by using `--enable-experimental-asm` when building. - Refill of the keypool no longer flushes the wallet between each key which resulted in a ~20x speedup in creating a new wallet. Part of this speedup was used to increase the default keypool to 1000 keys to make recovery more robust. (See [PR 10831](https://github.com/bitcoin/bitcoin/pull/10831)). -- Scrypt hashing has been optimized for architectures supporting SSE 2 (See [PR 362](https://github.com/litecoin-project/litecoin/pull/362)). This boosts scrypt hashing performance by a factor of 2. In version 0.15, scrypt hardware optimization is disabled in release builds by default, but can be enabled by using `--enable-sse2` when building. +- Scrypt hashing has been optimized for architectures supporting SSE 2 (See [PR 362](https://github.com/floblockchain/flo/pull/362)). This boosts scrypt hashing performance by a factor of 2. In version 0.15, scrypt hardware optimization is disabled in release builds by default, but can be enabled by using `--enable-sse2` when building. Fee Estimation Improvements --------------------------- diff --git a/doc/release-process.md b/doc/release-process.md index 41e66f601..bdfd44dbd 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -5,7 +5,7 @@ Before every release candidate: * Update translations (ping wumpus on IRC) see [translation_process.md](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#synchronising-translations). -* Update manpages, see [gen-manpages.sh](https://github.com/litecoin-project/litecoin/blob/master/contrib/devtools/README.md#gen-manpagessh). +* Update manpages, see [gen-manpages.sh](https://github.com/floblockchain/flo/blob/master/contrib/devtools/README.md#gen-manpagessh). Before every minor and major release: @@ -33,10 +33,10 @@ If you're using the automated script (found in [contrib/gitian-build.sh](/contri Check out the source code in the following directory hierarchy. cd /path/to/your/toplevel/build - git clone https://github.com/litecoin-project/gitian.sigs.ltc.git - git clone https://github.com/litecoin-project/litecoin-detached-sigs.git + git clone https://github.com/floblockchain/gitian.sigs.ltc.git + git clone https://github.com/floblockchain/flo-detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git - git clone https://github.com/litecoin-project/litecoin.git + git clone https://github.com/floblockchain/flo.git ### Litecoin maintainers/release engineers, suggestion for writing release notes @@ -195,7 +195,7 @@ Codesigner only: Commit the detached codesign payloads: Non-codesigners: wait for Windows/OS X detached signatures: - Once the Windows/OS X builds each have 3 matching signatures, they will be signed with their respective release keys. -- Detached signatures will then be committed to the [litecoin-detached-sigs](https://github.com/litecoin-project/litecoin-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries. +- Detached signatures will then be committed to the [litecoin-detached-sigs](https://github.com/floblockchain/flo-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries. Create (and optionally verify) the signed OS X binary: @@ -279,6 +279,6 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur - Archive release notes for the new version to `doc/release-notes/` (branch `master` and branch of the release) - - Create a [new GitHub release](https://github.com/litecoin-project/litecoin/releases/new) with a link to the archived release notes. + - Create a [new GitHub release](https://github.com/floblockchain/flo/releases/new) with a link to the archived release notes. - Celebrate diff --git a/src/init.cpp b/src/init.cpp index 6be6b83d4..c564a37ea 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -525,7 +525,7 @@ std::string HelpMessage(HelpMessageMode mode) std::string LicenseInfo() { - const std::string URL_SOURCE_CODE = ""; + const std::string URL_SOURCE_CODE = ""; const std::string URL_WEBSITE = ""; return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2011, COPYRIGHT_YEAR) + " ") + "\n" +