From a2e9bf288d993285f6c2cb8a26d79af76d84a34f Mon Sep 17 00:00:00 2001 From: Dr Fried Rice <48026627+GrapeLUX@users.noreply.github.com> Date: Tue, 19 Mar 2019 14:36:37 +0000 Subject: [PATCH] Revert "Revert "P001 refilltests removal"" --- README.md | 4 +- building/mac/README.md | 2 +- contrib/debian/control | 4 +- contrib/gitian-build.sh | 8 +- contrib/gitian-descriptors/README.md | 4 +- contrib/gitian-descriptors/gitian-aarch64.yml | 2 +- .../gitian-descriptors/gitian-osx-signer.yml | 2 +- contrib/gitian-descriptors/gitian-rpi2.yml | 2 +- .../gitian-descriptors/gitian-win-signer.yml | 2 +- doc/CHANGELOG | 5 + ...s-contracts-and-Leverage-Margin-trading.md | 106 ------------ doc/README | 18 --- doc/README_osx.md | 2 +- doc/README_windows.txt | 10 +- doc/build-msw.txt | 84 ---------- doc/build-netbsd.md | 2 +- doc/build-osx.md | 19 ++- doc/build-osx.txt | 54 ------- doc/build-unix.txt | 153 ------------------ doc/build-windows.md | 4 +- doc/gitian-building.md | 6 +- doc/release-notes.md | 90 ----------- doc/release-notes/release-notes-4.0.0.md | 128 --------------- doc/release-process.md | 6 +- doc/release-process.txt | 142 ---------------- doc/translation_process.md | 4 +- docker/Dockerfile | 2 +- src/init.cpp | 11 +- 28 files changed, 63 insertions(+), 813 deletions(-) delete mode 100644 doc/Perpetual-Futures-contracts-and-Leverage-Margin-trading.md delete mode 100755 doc/README mode change 100755 => 100644 doc/README_windows.txt delete mode 100755 doc/build-msw.txt delete mode 100755 doc/build-osx.txt delete mode 100755 doc/build-unix.txt delete mode 100755 doc/release-notes.md delete mode 100755 doc/release-notes/release-notes-4.0.0.md delete mode 100755 doc/release-process.txt diff --git a/README.md b/README.md index a6345cd9..bb216b5f 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Luxcore is GNU AGPLv3 licensed. -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2F216k155%2Flux.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2F216k155%2Flux?ref=badge_shield) [![Build Status](https://travis-ci.org/LUX-Core/lux.svg?branch=master)](https://travis-ci.org/LUX-Core/lux) [![GitHub version](https://badge.fury.io/gh/LUX-Core%2Flux.png)](https://badge.fury.io/gh/LUX-Core%2Flux.png) [![HitCount](http://hits.dwyl.io/216k155/lux.svg)](http://hits.dwyl.io/216k155/lux) +[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FLUX-Core%2Flux.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FLUX-Core%2Flux?ref=badge_shield) [![Build Status](https://travis-ci.org/LUX-Core/lux.svg?branch=master)](https://travis-ci.org/LUX-Core/lux) [![GitHub version](https://badge.fury.io/gh/LUX-Core%2Flux.png)](https://badge.fury.io/gh/LUX-Core%2Flux.png) [![HitCount](http://hits.dwyl.io/LUX-Core/lux.svg)](http://hits.dwyl.io/LUX-Core/lux) Discord server follow on Twitter [![Build history](https://buildstats.info/travisci/chart/LUX-Core/lux?branch=master)](https://travis-ci.org/LUX-Core/lux?branch=master) @@ -275,4 +275,4 @@ not straightforward. [ISSUE_TEMPLATE](doc/template/ISSUE_TEMPLATE_example.md) ## License -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2F216k155%2Flux.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2F216k155%2Flux?ref=badge_large) +[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FLUX-Core%2Flux.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FLUX-Core%2Flux?ref=badge_large) diff --git a/building/mac/README.md b/building/mac/README.md index 44f4804c..52fa52bf 100755 --- a/building/mac/README.md +++ b/building/mac/README.md @@ -8,7 +8,7 @@ 2. Clone lux repository ```shell - git clone https://github.com/216k155/lux + git clone https://github.com/LUX-Core/lux ``` 3. Ensure mysql and boost installed. diff --git a/contrib/debian/control b/contrib/debian/control index f4afb062..8de714c8 100755 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -23,8 +23,8 @@ Build-Depends: debhelper, libprotobuf-dev, protobuf-compiler Standards-Version: 3.9.2 Homepage: http://www.luxcore.io -Vcs-Git: git://github.com/216k155/lux.git -Vcs-Browser: http://github.com/216k155/lux +Vcs-Git: git://github.com/LUX-Core/lux.git +Vcs-Browser: http://github.com/LUX-Core/lux Package: luxd Architecture: any diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index 86a963ad..6a7ea9a9 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/216k155/lux +url=https://github.com/LUX-Core/lux proc=2 mem=2000 lxc=true @@ -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/216k155/lux +-u|--url Specify the URL of the repository. Default is https://github.com/LUX-Core/lux -v|--verify Verify the gitian build -b|--build Do a gitian build -s|--sign Make signed binaries for Windows and Mac OSX @@ -237,8 +237,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/216k155/gitian.sigs.git - git clone https://github.com/216k155/detached-sigs.git + git clone https://github.com/LUX-Core/gitian.sigs.git + git clone https://github.com/LUX-Core/detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git pushd ./gitian-builder if [[ -n "$USE_LXC" ]] diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 01e1c677..a5864851 100755 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -20,7 +20,7 @@ Sanity checks: Once you've got the right hardware and software: - git clone git://github.com/216k155/lux.git + git clone git://github.com/LUX-Core/lux.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs cd gitian-builder/inputs @@ -62,5 +62,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/216k155/lux.git + git clone git://github.com/LUX-Core/lux.git ... etc diff --git a/contrib/gitian-descriptors/gitian-aarch64.yml b/contrib/gitian-descriptors/gitian-aarch64.yml index 1e5b8f52..ee35771a 100755 --- a/contrib/gitian-descriptors/gitian-aarch64.yml +++ b/contrib/gitian-descriptors/gitian-aarch64.yml @@ -25,7 +25,7 @@ packages: - "python" reference_datetime: "2018-04-05 00:00:00" remotes: -- "url": "https://github.com/216k155/lux.git" +- "url": "https://github.com/LUX-Core/lux.git" "dir": "lux" files: [] script: | diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index d897cfb9..994d4883 100755 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -7,7 +7,7 @@ architectures: packages: - "faketime" remotes: -- "url": "https://github.com/216k155/detached-sigs.git" +- "url": "https://github.com/LUX-Core/detached-sigs.git" "dir": "signature" files: - "lux-osx-unsigned.tar.gz" diff --git a/contrib/gitian-descriptors/gitian-rpi2.yml b/contrib/gitian-descriptors/gitian-rpi2.yml index c4434728..1ec364a6 100755 --- a/contrib/gitian-descriptors/gitian-rpi2.yml +++ b/contrib/gitian-descriptors/gitian-rpi2.yml @@ -20,7 +20,7 @@ packages: - "python" reference_datetime: "2015-06-01 00:00:00" remotes: -- "url": "https://github.com/216k155/lux.git" +- "url": "https://github.com/LUX-Core/lux.git" "dir": "lux" files: - "raspberrypi-tools.tar.gz" diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 44c90bf3..5b8fbacd 100755 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -8,7 +8,7 @@ packages: - "libssl1.0-dev" - "autoconf" remotes: -- "url": "https://github.com/216k155/detached-sigs.git" +- "url": "https://github.com/LUX-Core/detached-sigs.git" "dir": "signature" files: - "osslsigncode-1.7.1.tar.gz" diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 1e10b7ad..3b1ad363 100755 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,8 @@ +# Version 4.0.x to 5.3.2.1 +=============== ++Manythings ++will try my best to keep updated from now on + # Version 4.0.0 =============== +Wallet version upgraded diff --git a/doc/Perpetual-Futures-contracts-and-Leverage-Margin-trading.md b/doc/Perpetual-Futures-contracts-and-Leverage-Margin-trading.md deleted file mode 100644 index 7cd31753..00000000 --- a/doc/Perpetual-Futures-contracts-and-Leverage-Margin-trading.md +++ /dev/null @@ -1,106 +0,0 @@ -![LUX Logo](../src/qt/res/images/lux_logo_horizontal.png) - -"FIRST OF ITS KIND" - -Luxcore is GNU AGPLv3 licensed. - -LUXGATE Perpetual & Futures contracts - Leverage & Margin trading. -================================================================== - -Luxgate is a decentralized exchange, so all orders will be listed on LUX explorer and all transactions are stored in the LUX blockchain. - -## Perpetual & Futures contracts. - -Futures are a derivative tool or agreement to buy or sell a primary asset at a predetermined price at a specified time in the future. With Luxgate you can trade using the futures contracts that cannot be delivered, which means that the difference between the perpetual contracts price and the spot price will be automatically calculated at the time specified in the contract. - -## Leverage & Margin trading. - -Financial leverage is the expression of the level of loan use in the total capital of the enterprise to increase the rate of equity return (ROE) or the income per ordinary share of the company. - -Financial leverage refers to the combination of liabilities and owners' equity in regulating corporate financial policies. Financial leverage will be considerable in businesses with a higher proportion of liabilities than equity. Conversely, financial leverage will be low when the proportion of liabilities is smaller than the proportion of equity. - -Financial leverage is both a tool to promote after-tax profits on an owner's equity and a tool to curb that increase. High profitability is the desire of the owners, in which financial leverage is a tool used by managers. - - -* Below is a basic example of using leverage, also known as simple leverage. - - - A and B are currently trading LUX/USD in their locality. - - A used the amount of USD 100,000,000 to buy 10 LUX for USD 10,000,000 / LUX. The total amount A currently uses is 100,000,000 USD. He only uses his existing capital to do business without using financial leverage, not borrowing more. - - B also used the capital of USD 100,000,000 and borrowed more than USD 50,000,000 to buy 15 LUX for USD 10,000,000 / LUX. The total amount B currently uses is 150,000,000 USD. Currently, B borrowed more money from his friends, which is B's use of financial leverage. B is controlling 15 LUX with only USD 100,000,000. - - If LUX is favorable, the total ROE value of B and A increases by 25%, they sell then: - - * A profit USD 100,000,000 x 0.25 = USD 25,000,000, from the initial capital of USD 100,000,000. 25% profit - - * B earns USD 150,000,000 x 0.25 = USD 37,500,000, from it initial capital of USD 100,000,000. Profit of 37.5%. - - If LUX is unstable, the total ROE value of B and A decreases by 10%, they sell then: - - * A lost USD 100,000,000 x 10% = USD 10,000,000. Damage 10% of it capital. - - * B lost USD 150,000,000 x 10% = USD 15,000,000. Damage 15% of it capital. - - Through this, we see that when using financial leverage effectively, the profit margin is much higher than not using financial leverage. But it is also necessary to carefully consider the business plans to minimize the risks that lead to losses. - - -* Formula to calculate financial leverage - - DFL = (% change in EPS) / (% change in EBIT) - - DFL is a leverage ratio that shows the effect of a specific debt on the company's earnings per share. - -* Leverage - -Luxgate offers leverage on operations with derivatives with the maximum of `x100 leverage`. `Note: high leverage increases trading risks`. - -* Masternode Collateral System & Open Position - -To open a position, you need to have a sufficient initial margin level which is holding by our `masternode collateral` function. It is a 100% `decentralised collateral system` that Luxcore specially implemented to serves as collateral for your order. It is calculated in proportion to the leverage you choose. - -Example: - - Initial margin for leverage x2 is 50% of the order amount; initial margin for leverage x10 is 10% of the order amount; for leverage x 25 you need to deposit only 4% of the order amount. After your order is executed, 30% of the initial margin will be transferred to you Margin Balance. This amount will be automatically used to maintain your positions, or you can use it to place new orders or transfer it to your account. - -* Liquidation - -You need to have a sufficient level of maintenance margin balance for your current position, otherwise, your position will be liquidated - - 70% of the initial margin for your postion - - Margin Balance, including 30% of the initial margin for your position - - If your position exceeds maintenance margin, it will be liquidated. - -* Cross Margin - -Luxgate also has cross margin method. This means that the maintenance margin of your Margin Balance will be shared among all your open positions. Therefore, when a trader has several open positions, the maintenance margin also includes: - - Unrealized positive PNL on all open positions - -Example: - - (.....) - -### Margin Balance - -Margin balances are designed to maintain existing positions with leverage. Margin balances automatically maintain positions close to liquidation. - -### Liquidation Process - -If your total balance is not enough to maintain your position, they can be liquidated. The Fair price marking system is used to calculate the liquidation price. It allows avoiding spurious liquidation when price exceptions occur due to market manipulation. If traders cannot meet their maintenance requirements, they will be liquidated. - -### Fees - -To record information about opening an order and add information about a completed transaction to the LUX blockchain, you need to spend a particular amount of TX fee. - - -* Luxgate fees, Makers and Takers fees. - - Fee for makers is 0% + blockchain fee (TX fee) for placing an order. - - Fee for takers is 0,1% + blockchain fee (TX fee) for placing an order. - - TX fee is used for all the transaction within the LUX blockchain system. diff --git a/doc/README b/doc/README deleted file mode 100755 index 6a63a000..00000000 --- a/doc/README +++ /dev/null @@ -1,18 +0,0 @@ -Lux 0.4.4 BETA - -Copyright (c) 2013 NovaCoin Developers -Copyright (c) 2011-2012 PPCoin Developers -Distributed under the MIT/X11 software license, see the accompanying -file license.txt or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com). - - -Intro ------ -Lux is a free open source project derived from Bitcoin, with -the goal of providing a long-term energy-efficient scrypt-based crypto-currency. -Built on the foundation of Bitcoin, PPCoin and NovaCoin, innovations such as proof-of-stake -help further advance the field of crypto-currency. - diff --git a/doc/README_osx.md b/doc/README_osx.md index e67d4a9d..ae8f124b 100755 --- 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. - **TODO** 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/216k155/detached-sigs). + using the script that is also included there. Detached signatures are available from this [repository](https://github.com/LUX-Core/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/README_windows.txt b/doc/README_windows.txt old mode 100755 new mode 100644 index d3584cb7..44e0bed3 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,5 +1,5 @@ Luxcore -===================== +============= Intro ----- @@ -13,7 +13,11 @@ Setup ----- Unpack the files into a directory and run lux-qt.exe. -Luxcore is the original LUX client and it builds the backbone of the network. -However, it downloads and stores the entire history of LUX transactions; +Luxcore is the original Lux client and it builds the backbone of the network. +However, it downloads and stores the entire history of lux transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. + +See the lux docs at: + https://docs.luxcore.io/ +for more help and information. \ No newline at end of file diff --git a/doc/build-msw.txt b/doc/build-msw.txt deleted file mode 100755 index 7bcf1477..00000000 --- a/doc/build-msw.txt +++ /dev/null @@ -1,84 +0,0 @@ -Copyright (c) 2009-2012 Bitcoin Developers -Distributed under the MIT/X11 software license, see the accompanying -file license.txt or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP -software written by Thomas Bernard. - - -See readme-qt.rst for instructions on building Lux QT, the -graphical user interface. - -WINDOWS BUILD NOTES -=================== - -Compilers Supported -------------------- -TODO: What works? -Note: releases are cross-compiled using mingw running on Linux. - - -Dependencies ------------- -Libraries you need to download separately and build: - - default path download -OpenSSL \openssl-1.0.1b-mgw http://www.openssl.org/source/ -Berkeley DB \db-4.8.30.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html -Boost \boost-1.47.0-mgw http://www.boost.org/users/download/ -miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/ - -Their licenses: -OpenSSL Old BSD license with the problematic advertising requirement -Berkeley DB New BSD license with additional requirement that linked software must be free open source -Boost MIT-like license -miniupnpc New (3-clause) BSD license - -Versions used in this release: -OpenSSL 1.0.1b -Berkeley DB 4.8.30.NC -Boost 1.47.0 -miniupnpc 1.6 - - -OpenSSL -------- -MSYS lux: -un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377) -change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe' - -cd /c/openssl-1.0.1b-mgw -./config -make - -Berkeley DB ------------ -MSYS lux: -cd /c/db-4.8.30.NC-mgw/build_unix -sh ../dist/configure --enable-mingw --enable-cxx -make - -Boost ------ -DOS prompt: -downloaded boost jam 3.1.18 -cd \boost-1.47.0-mgw -bjam toolset=gcc --build-type=complete stage - -MiniUPnPc ---------- -UPnP support is optional, make with USE_UPNP= to disable it. - -MSYS lux: -cd /c/miniupnpc-1.6-mgw -make -f Makefile.mingw -mkdir miniupnpc -cp *.h miniupnpc/ - -Lux -------- -DOS prompt: -cd \lux\src -mingw32-make -f makefile.mingw -strip luxd.exe diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md index 19fd6168..2ae9dd65 100644 --- a/doc/build-netbsd.md +++ b/doc/build-netbsd.md @@ -25,7 +25,7 @@ python27 Download the source code: ``` -git clone https://github.com/216k155/lux +git clone https://github.com/LUX-Core/lux ``` See [dependencies.md](dependencies.md) for a complete overview. diff --git a/doc/build-osx.md b/doc/build-osx.md index 727b723b..b08d0b2d 100755 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -5,7 +5,7 @@ This guide will show you how to build luxd (headless client) for OSX. Notes ----- -* Tested on OS X 10.7 through 10.10 on 64-bit Intel processors only. +* Tested on OS X 10.7 through 10.14 on 64-bit Intel processors only. * All of the commands should be executed in a Terminal application. The built-in one is located in `/Applications/Utilities`. @@ -19,7 +19,14 @@ available on your OS X installation media, but if not, you can get the current version from https://developer.apple.com/xcode/. If you install Xcode 4.3 or later, you'll need to install its command line tools. This can be done in `Xcode > Preferences > Downloads > Components` and generally must -be re-done or updated every time Xcode is updated. +be re-done or updated every time Xcode is updated. If, instead, you'd like +to install it from the command line, use `xcode-select --install` + +If you're on Mojave, remember to run + + open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg + +to get proper build headers There's also an assumption that you already have `git` installed. If not, it's the path of least resistance to install [Github for Mac](https://mac.github.com/) @@ -38,7 +45,11 @@ Instructions: Homebrew #### Install dependencies using Homebrew - brew install autoconf automake berkeley-db4 libtool boost miniupnpc openssl pkg-config protobuf qt5 libzmq + brew install automake berkeley-db4 libtool boost@1.60 miniupnpc openssl pkg-config protobuf python qt libevent qrencode librsvg + +### Force link `boost` + + brew link boost@1.60 --force ### Building `luxd` @@ -49,6 +60,8 @@ Instructions: Homebrew 2. Build luxd: + export LDFLAGS=-L/usr/local/opt/openssl/lib + export CPPFLAGS=-I/usr/local/opt/openssl/include ./autogen.sh ./configure --with-gui=qt5 make diff --git a/doc/build-osx.txt b/doc/build-osx.txt deleted file mode 100755 index 159cec3d..00000000 --- a/doc/build-osx.txt +++ /dev/null @@ -1,54 +0,0 @@ -Copyright (c) 2009-2012 Bitcoin Developers -Distributed under the MIT/X11 software license, see the accompanying file -license.txt or http://www.opensource.org/licenses/mit-license.php. This -product includes software developed by the OpenSSL Project for use in the -OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic -software written by Eric Young (eay@cryptsoft.com) and UPnP software written by -Thomas Bernard. - - -Mac OS X luxd build instructions -Laszlo Hanyecz -Douglas Huff - - -See readme-qt.rst for instructions on building Lux QT, the -graphical user interface. - -Tested on 10.5 and 10.6 intel. PPC is not supported because it's big-endian. - -All of the commands should be executed in Terminal.app.. it's in -/Applications/Utilities - -You need to install XCode with all the options checked so that the compiler and -everything is available in /usr not just /Developer I think it comes on the DVD -but you can get the current version from http://developer.apple.com - - -1. Clone the github tree to get the source code: - -git clone git@github.com:rat4/lux.git lux - -2. Download and install MacPorts from http://www.macports.org/ - -2a. (for 10.7 Lion) - Edit /opt/local/etc/macports/macports.conf and uncomment "build_arch i386" - -3. Install dependencies from MacPorts - -sudo port install boost db48 openssl miniupnpc - -Optionally install qrencode (and set USE_QRCODE=1): -sudo port install qrencode - -4. Now you should be able to build luxd: - -cd lux/src -make -f makefile.osx - -Run: - ./luxd --help # for a list of command-line options. -Run - ./luxd -daemon # to start the lux daemon. -Run - ./luxd help # When the daemon is running, to get a list of RPC commands diff --git a/doc/build-unix.txt b/doc/build-unix.txt deleted file mode 100755 index 9c4a6ffe..00000000 --- a/doc/build-unix.txt +++ /dev/null @@ -1,153 +0,0 @@ -Copyright (c) 2009-2012 Bitcoin Developers -Distributed under the MIT/X11 software license, see the accompanying -file license.txt or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP -software written by Thomas Bernard. - - -UNIX BUILD NOTES -================ - -To Build --------- - -cd src/ -make -f makefile.unix # Headless lux - -See readme-qt.rst for instructions on building Lux QT, -the graphical lux. - -Dependencies ------------- - - Library Purpose Description - ------- ------- ----------- - libssl SSL Support Secure communications - libdb Berkeley DB Blockchain & wallet storage - libboost Boost C++ Library - miniupnpc UPnP Support Optional firewall-jumping support - libqrencode QRCode generation Optional QRCode generation - -Note that libexecinfo should be installed, if you building under *BSD systems. -This library provides backtrace facility. - -miniupnpc may be used for UPnP port mapping. It can be downloaded from -http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and -turned off by default. Set USE_UPNP to a different value to control this: - USE_UPNP=- No UPnP support - miniupnp not required - USE_UPNP=0 (the default) UPnP support turned off by default at runtime - USE_UPNP=1 UPnP support turned on by default at runtime - -libqrencode may be used for QRCode image generation. It can be downloaded -from http://fukuchi.org/works/qrencode/index.html.en, or installed via -your package manager. Set USE_QRCODE to control this: - USE_QRCODE=0 (the default) No QRCode support - libqrcode not required - USE_QRCODE=1 QRCode support enabled - -Licenses of statically linked libraries: - Berkeley DB New BSD license with additional requirement that linked - software must be free open source - Boost MIT-like license - miniupnpc New (3-clause) BSD license - -Versions used in this release: - GCC 4.9.0 - OpenSSL 1.0.1g - Berkeley DB 5.3.28.NC - Boost 1.55.0 - miniupnpc 1.9.20140401 - -Dependency Build Instructions: Ubuntu & Debian ----------------------------------------------- -sudo apt-get install build-essential -sudo apt-get install libssl-dev -sudo apt-get install libdb++-dev -sudo apt-get install libboost-all-dev -sudo apt-get install libqrencode-dev - -If using Boost 1.37, append -mt to the boost libraries in the makefile. - - -Dependency Build Instructions: Gentoo -------------------------------------- - -emerge -av1 --noreplace boost openssl sys-libs/db - -Take the following steps to build (no UPnP support): - cd ${TX_DIR}/src - make -f makefile.unix USE_UPNP= - strip luxd - - -Notes ------ -The release is built with GCC and then "strip luxd" to strip the debug -symbols, which reduces the executable size by about 90%. - - -miniupnpc ---------- -tar -xzvf miniupnpc-1.6.tar.gz -cd miniupnpc-1.6 -make -sudo su -make install - - -Berkeley DB ------------ -You need Berkeley DB. If you have to build Berkeley DB yourself: -../dist/configure --enable-cxx -make - - -Boost ------ -If you need to build Boost yourself: -sudo su -./bootstrap.sh -./bjam install - - -Security --------- -To help make your lux installation more secure by making certain attacks impossible to -exploit even if a vulnerability is found, you can take the following measures: - -* Position Independent Executable - Build position independent code to take advantage of Address Space Layout Randomization - offered by some kernels. An attacker who is able to cause execution of code at an arbitrary - memory location is thwarted if he doesn't know where anything useful is located. - The stack and heap are randomly located by default but this allows the code section to be - randomly located as well. - - On an Amd64 processor where a library was not compiled with -fPIC, this will cause an error - such as: "relocation R_X86_64_32 against `......' can not be used when making a shared object;" - - To build with PIE, use: - make -f makefile.unix ... -e PIE=1 - - To test that you have built PIE executable, install scanelf, part of paxutils, and use: - scanelf -e ./lux - - The output should contain: - TYPE - ET_DYN - -* Non-executable Stack - If the stack is executable then trivial stack based buffer overflow exploits are possible if - vulnerable buffers are found. By default, lux should be built with a non-executable stack - but if one of the libraries it uses asks for an executable stack or someone makes a mistake - and uses a compiler extension which requires an executable stack, it will silently build an - executable without the non-executable stack protection. - - To verify that the stack is non-executable after compiling use: - scanelf -e ./lux - - the output should contain: - STK/REL/PTL - RW- R-- RW- - - The STK RW- means that the stack is readable and writeable but not executable. diff --git a/doc/build-windows.md b/doc/build-windows.md index 7ed6c6cf..244197fc 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -105,7 +105,7 @@ This means you cannot use a directory that located directly on the host Windows Acquire the source in the usual way: - git clone https://github.com/216k155/lux.git + git clone https://github.com/LUX-Core/lux.git Once the source code is ready the build steps are below. @@ -133,7 +133,7 @@ This means you cannot use a directory that located directly on the host Windows Acquire the source in the usual way: - git clone https://github.com/216k155/lux.git + git clone https://github.com/LUX-Core/lux.git Then build using: diff --git a/doc/gitian-building.md b/doc/gitian-building.md index 2bf7c30f..9164e0da 100755 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -281,7 +281,7 @@ Clone the git repositories for lux and gitian and then checkout the lux version ```bash git clone https://github.com/devrandom/gitian-builder.git -git clone https://github.com/216k155/lux.git +git clone https://github.com/LUX-Core/lux.git cd lux git checkout v${VERSION} cd .. @@ -350,7 +350,7 @@ Output from `gbuild` will look something like remote: Total 35606 (delta 0), reused 0 (delta 0) Receiving objects: 100% (35606/35606), 26.52 MiB | 4.28 MiB/s, done. Resolving deltas: 100% (25724/25724), done. - From https://github.com/216k155/lux + From https://github.com/LUX-Core/lux ... (new tags, new branch etc) --- Building for precise x86_64 --- Stopping target if it is up @@ -408,6 +408,6 @@ Uploading signatures (not yet implemented) --------------------- In the future it will be possible to push your signatures (both the `.assert` and `.assert.sig` files) to the -[lux/gitian.sigs](https://github.com/216k155/gitian.sigs/) repository, or if that's not possible to create a pull +[lux/gitian.sigs](https://github.com/LUX-Core/gitian.sigs/) repository, or if that's not possible to create a pull request. There will be an official announcement when this repository is online. diff --git a/doc/release-notes.md b/doc/release-notes.md deleted file mode 100755 index ceb0ed24..00000000 --- a/doc/release-notes.md +++ /dev/null @@ -1,90 +0,0 @@ -(note: this is a temporary file, to be added-to by anybody, and moved to release-notes at release time) - -Luxcore version *version* is now available from: - - - -This is a new major version release, including various bug fixes and -performance improvements, as well as updated translations. - -Please report bugs using the issue tracker at github: - - - -Mandatory Update -============== - -Luxcore v3.0.0 is a mandatory update for all users. This release contains new consensus rules and improvements that are not backwards compatible with older versions. Users will have a grace period of one week to update their clients before enforcement of this update is enabled. - -Users updating from a previous version after the 16th of October will require a full resync of their local blockchain from either the P2P network or by way of the bootstrap. - -How to Upgrade -============== - -If you are running an older version, shut it down. Wait until it has completely shut down (which might take a few minutes for older versions), then run the installer (on Windows) or just copy over /Applications/LUX-Qt (on Mac) or luxd/lux-qt (on Linux). - -Compatibility -============== - -Luxcore is extensively tested on multiple operating systems using -the Linux kernel, macOS 10.8+, and Windows Vista and later. - -Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support), -No attempt is made to prevent installing or running the software on Windows XP, you -can still do so at your own risk but be aware that there are known instabilities and issues. -Please do not report issues about Windows XP to the issue tracker. - -Luxcore should also work on most other Unix-like systems but is not -frequently tested on them. - -Notable Changes -=============== - -Zerocoin (zLUX) Protocol ---------------------- - -At long last, the zLUX release is here and the zerocoin protocol has been fully implemented! This allows users to send transactions with 100% fungible coins and absolutely zero history or link-ability to their previous owners. - -Full and comprehensive details about the process and the use will be posted here during the days between Oct 6 and Oct 13. - -Tor Service Integration Improvements ---------------------- - -Integrating with Tor is now easier than ever! Starting with Tor version 0.2.7.1 it is possible, through Tor's control socket API, to create and destroy 'ephemeral' hidden services programmatically. Luxcore has been updated to make use of this. - -This means that if Tor is running (and proper authorization is available), Luxcore automatically creates a hidden service to listen on, without manual configuration. Luxcore will also use Tor automatically to connect to other .onion nodes if the control socket can be successfully opened. This will positively affect the number of available .onion nodes and their usage. - -This new feature is enabled by default if Luxcore is listening, and a connection to Tor can be made. It can be configured with the `-listenonion`, `-torcontrol` and `-torpassword` settings. To show verbose debugging information, pass `-debug=tor`. - -*version* Change log -================= - -Detailed release notes follow. This overview includes changes that affect -behavior, not code moves, refactors and string updates. For convenience in locating -the code changes and accompanying discussion, both the pull request and -git merge commit are mentioned. - -### Broad Features -- #264 `15e84e5` zLUX is here! (Fuzzbawls Mrs-X Presstab Spock LUX) - -### P2P Protocol and Network Code -- #242 `0ecd77f` [P2P] Improve TOR service connectivity (Fuzzbawls) - -### GUI -- #251 `79af8d2` [Qt] Adjust masternode count in information UI (Mrs-X) - -### Miscellaneous -- #258 `c950765` [Depends] Update Depends with newer versions (Fuzzbawls) - -Credits -======= - -Thanks to everyone who directly contributed to this release: -- Fuzzbawls -- Jon Spock -- Mrs-X -- LUX -- amirabrams -- presstab - -As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/216k155-translations/). diff --git a/doc/release-notes/release-notes-4.0.0.md b/doc/release-notes/release-notes-4.0.0.md deleted file mode 100755 index dcd26801..00000000 --- a/doc/release-notes/release-notes-4.0.0.md +++ /dev/null @@ -1,128 +0,0 @@ -Luxcore version 4.0.0 is now available from: - - - -This is a new minor-revision version release, including various bug fixes and -performance improvements, as well as updated translations. - -Please report bugs using the issue tracker at github: - - - -Recommended Update -============== - -Luxcore v4.0.0 is a recommended, semi-mandatory update for all users. This release contains transaction creation bug fixes for zLUX spends, automint calculation adjustments, and other various updates/fixes. - -zLUX spending requires this update. - -How to Upgrade -============== - -If you are running an older version, shut it down. Wait until it has completely shut down (which might take a few minutes for older versions), then run the installer (on Windows) or just copy over /Applications/LUX-Qt (on Mac) or luxd/lux-qt (on Linux). - -Compatibility -============== - -Luxcore is extensively tested on multiple operating systems using -the Linux kernel, macOS 10.8+, and Windows Vista and later. - -Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support), -No attempt is made to prevent installing or running the software on Windows XP, you -can still do so at your own risk but be aware that there are known instabilities and issues. -Please do not report issues about Windows XP to the issue tracker. - -Luxcore should also work on most other Unix-like systems but is not -frequently tested on them. - -### :exclamation::exclamation::exclamation: MacOS 10.13 High Sierra :exclamation::exclamation::exclamation: - -**Currently there are issues with the 3.0.x gitian releases on MacOS version 10.13 (High Sierra), no reports of issues on older versions of MacOS.** - - -Notable Changes -=============== - -Auto Wallet Backup ---------------------- -In addition to the automatic wallet backup that is done at each start of the client, a new automatic backup function has been added that will, by default, create a backup of the wallet file during each zLUX mint operation (zLUX spends which re-mint their change are also included in this). This functionality is controlled by the `-backupzlux` command-line option, which defaults to `1` (enabled, auto-backup). - -Users that wish to prevent this behavior (not recommended) can pass `-backupzlux=0` at the command-line when starting the client, or add `backupzlux=0` to their `lux.conf` file. - -zLUX Automint Calculations ---------------------- -A bug in the automint calculations was made apparent on mainnet when block times exceeded expectations, resulting in zLUX mint transactions that were in an unconfirmed state to still be treated as if they had never been minted. This caused automint to effectively mint more than what was intended. - -zLUX Spending Fix ---------------------- -The size of zLUX spend transactions is knowingly larger than normal transactions, and while this was expected, a much stricter check against the scriptsig size is used for mainnet, causing the transactions to be rejected by the mempool, and thus not being packaged into any blocks. - -zLUX Transaction Recovery ---------------------- -Due to the aforementioned issue with zLUX spending, users may find that their attempted spends are now conflicted and zLUX balances are not represented as expected. "Recovery" of these transactions can be done using the following methods: - -1. GUI: - - The Privacy tab has the `Reset` and `Rescan` buttons that can be used to restore these mints/spends from a state of being marked as unavailable. - -2. RPC: - - The RPC commands `resetspentzerocoin` and `resetmintzerocoin` are the command-line counterparts to the above, and can be used by users that do not use the GUI wallet. - -RPC Changes ---------------------- -The `bip38decrypt` command has had it's parameter order changed to be more consistent with it's counterpart. The command now expects the LUX address as it's first parameter and the passphrase as it's second parameter. - -Bip38 Compatibility With 3rd Party Tools ---------------------- -The in-wallet bip38 encryption method was leaving the final 4 bytes of the encrypted key blank. This caused an incompatibility issue with 3rd party tools like the paper wallet generators that could decrypt bip38 encrypted keys. Cross-tool compatibility has now been restored. - -4.0.0 Change log -================= - -Detailed release notes follow. This overview includes changes that affect -behavior, not code moves, refactors and string updates. For convenience in locating -the code changes and accompanying discussion, both the pull request and -git merge commit are mentioned. - -### RPC and other APIs -- #275 `059aaa9` [RPC] Change Parameter Order of bip38decrypt (presstab) - -### P2P Protocol and Network Code -- #286 `85c0f53` [Main] Change sporkDB from smart ptr to ptr. (presstab) -- #292 `feadab4` Additional checks for double spending of zLux serials. (presstab) - -### Wallet -- #271 `5e9a086` [Wallet] Remove unused member wallet in UnlockContext inner class (Jon Spock) -- #279 `e734010` Add -backupzlux startup flag. (presstab) -- #280 `fdc182d` [Wallet] Fix zLux spending errors. (presstab) -- #282 `4.0.016` [Wallet] Count pending zLux balance for automint. (presstab) -- #290 `004d7b6` Include both pending and mature zerocoins for automint calculations (presstab) - -### GUI -- #268 `bc63f24` [GUI/RPC] Changed bubblehelp text + RPC startmasternode help text fixed (Mrs-X) -- #269 `5466a9b` Check if model is valid before using in transactionView (Jon Spock) -- #270 `bd2328e` [Qt] Make lock icon clickable to toggle wallet lock state (Fuzzbawls) -- #273 `f31136e` [Qt] Fix UI tab order and shortcuts (Mrs-X) -- #287 `74a1c3c` [Qt] Don't allow the Esc key to close the privacy tab (Fuzzbawls) -- #291 `cb314e6` [Qt] zLux control quantity/amount fixes (rejectedpromise) - -### Miscellaneous -- #266 `2d97b54` [Scripts] Fix location for aarch64 outputs in gitian-build.sh (Fuzzbawls) -- #272 `958f51e` [Minting] Replace deprecated auto_ptr. (presstab) -- #276 `03f14ba` Append BIP38 encrypted key with an 4 byte Base58 Checksum (presstab) -- #288 `2522aa1` Bad CBlockHeader copy. (furszy) - -Credits -======= - -Thanks to everyone who directly contributed to this release: -- Fuzzbawls -- Jon Spock -- Mrs-X -- furszy -- presstab -- rejectedpromise -- Warrows - -As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/216k155-translations/). diff --git a/doc/release-process.md b/doc/release-process.md index 3608d099..a3ef5561 100755 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -24,10 +24,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/216k155/gitian.sigs.git - git clone https://github.com/216k155/detached-sigs.git + git clone https://github.com/LUX-Core/gitian.sigs.git + git clone https://github.com/LUX-Core/detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git - git clone https://github.com/216k155/lux.git + git clone https://github.com/LUX-Core/lux.git ### LUX maintainers/release engineers, suggestion for writing release notes diff --git a/doc/release-process.txt b/doc/release-process.txt deleted file mode 100755 index 4b618dc1..00000000 --- a/doc/release-process.txt +++ /dev/null @@ -1,142 +0,0 @@ -* update translations (ping tcatm on IRC for now) - -* update (commit) version in sources - bitcoin-qt.pro - src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true) - share/setup.nsi - doc/README* - -* tag version in git - - git tag -a v0.5.1 - -* write release notes. git shortlog helps a lot: - - git shortlog --no-merges v0.5.0.. - -* perform gitian builds - - * From a directory containing the bitcoin source, gitian-builder and gitian.sigs - export SIGNER=(your gitian key, ie bluematt, sipa, etc) - export VERSION=0.5.1 - cd ./gitian-builder - - * Fetch and build inputs: - mkdir -p inputs; cd inputs/ - wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz - wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz' - wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' - wget 'http://zlib.net/zlib-1.2.6.tar.gz' - wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz' - wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2' - wget 'http://downloads.sourceforge.net/project/boost/boost/1.47.0/boost_1_47_0.tar.bz2' - wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz' - cd .. - ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml - cp build/out/boost-win32-1.47.0-gitian.zip inputs/ - ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml - cp build/out/qt-win32-4.7.4-gitian.zip inputs/ - ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml - cp build/out/bitcoin-deps-0.0.3.zip inputs/ - - * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: - ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml - ./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml - pushd build/out - zip -r bitcoin-${VERSION}-linux-gitian.zip * - mv bitcoin-${VERSION}-linux-gitian.zip ../../ - popd - ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml - ./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml - pushd build/out - zip -r bitcoin-${VERSION}-win32-gitian.zip * - mv bitcoin-${VERSION}-win32-gitian.zip ../../ - popd - - Build output expected: - 1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip) - 2. windows 32-bit binary, installer + source (bitcoin-${VERSION}-win32-gitian.zip) - 3. Gitian signatures (in gitian.sigs/${VERSION}[-win32]/(your gitian key)/ - -* repackage gitian builds for release as stand-alone zip/tar/installer exe - - * Linux .tar.gz: - unzip bitcoin-${VERSION}-linux-gitian.zip -d bitcoin-${VERSION}-linux - tar czvf bitcoin-${VERSION}-linux.tar.gz bitcoin-${VERSION}-linux - rm -rf bitcoin-${VERSION}-linux - - * Windows .zip and setup.exe: - unzip bitcoin-${VERSION}-win32-gitian.zip -d bitcoin-${VERSION}-win32 - mv bitcoin-${VERSION}-win32/bitcoin-*-setup.exe . - zip -r bitcoin-${VERSION}-win32.zip bitcoin-${VERSION}-win32 - rm -rf bitcoin-${VERSION}-win32 - -* perform Mac build - See this blog post for how Gavin set up his build environment to build the OSX - release; note that a patched version of macdeployqt is not needed anymore, as - the required functionality and fixes are implemented directly in macdeployqtplus: - http://gavintech.blogspot.com/2011/11/deploying-bitcoin-qt-on-osx.html - Gavin also had trouble with the macports py27-appscript package; he - ended up installing a version that worked with: /usr/bin/easy_install-2.7 appscript - - qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro - make - export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files - T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) - python2.7 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist - - Build output expected: - Bitcoin-Qt.dmg - -* upload builds to SourceForge - -* create SHA256SUMS for builds, and PGP-sign it - -* update bitcoin.org version - -* update forum version - -* update wiki download links - -* update wiki changelog: https://en.bitcoin.it/wiki/Changelog - -* Commit your signature to gitian.sigs: - pushd gitian.sigs - git add ${VERSION}/${SIGNER} - git add ${VERSION}-win32/${SIGNER} - git commit -a - git push # Assuming you can push to the gitian.sigs tree - popd - -------------------------------------------------------------------------- - -* After 3 or more people have gitian-built, repackage gitian-signed zips: - - * From a directory containing bitcoin source, gitian.sigs and gitian zips - export VERSION=0.5.1 - mkdir bitcoin-${VERSION}-linux-gitian - pushd bitcoin-${VERSION}-linux-gitian - unzip ../bitcoin-${VERSION}-linux-gitian.zip - mkdir gitian - cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ - for signer in $(ls ../gitian.sigs/${VERSION}/); do - cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert - cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig - done - zip -r bitcoin-${VERSION}-linux-gitian.zip * - cp bitcoin-${VERSION}-linux-gitian.zip ../ - popd - mkdir bitcoin-${VERSION}-win32-gitian - pushd bitcoin-${VERSION}-win32-gitian - unzip ../bitcoin-${VERSION}-win32-gitian.zip - mkdir gitian - cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/ - for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do - cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert - cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig - done - zip -r bitcoin-${VERSION}-win32-gitian.zip * - cp bitcoin-${VERSION}-win32-gitian.zip ../ - popd - - * Upload gitian zips to SourceForge diff --git a/doc/translation_process.md b/doc/translation_process.md index 8b109d12..5d3bd339 100755 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -8,7 +8,7 @@ Transifex is setup to monitor the GitHub repo for updates, and when code contain Multiple language support is critical in assisting LUX's global adoption, and growth. One of LUX's greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated. -See the [Transifex LUX project](https://www.transifex.com/216k155/216k155-translations/) to assist in translations. +See the [Transifex LUX project](https://www.transifex.com/LUX-Core/LUX-Core-translations/) to assist in translations. ### Writing code with translations We use automated scripts to help extract translations in both Qt, and non-Qt source files. It is rarely necessary to manually edit the files in `src/qt/locale/`. The translation source files must adhere to the following format: @@ -43,7 +43,7 @@ git commit ### Creating a Transifex account Visit the [Transifex Signup](https://www.transifex.com/signup/) page to create an account. Take note of your username and password, as they will be required to configure the command-line tool. -You can find the LUX translation project at [https://www.transifex.com/216k155/216k155-translations/](https://www.transifex.com/216k155/216k155-translations/). +You can find the LUX translation project at [https://www.transifex.com/LUX-Core/LUX-Core-translations/](https://www.transifex.com/LUX-Core/LUX-Core-translations/). ### Installing the Transifex client command-line tool The client it used to fetch updated translations. If you are having problems, or need more details, see [http://docs.transifex.com/developer/client/setup](http://docs.transifex.com/developer/client/setup) diff --git a/docker/Dockerfile b/docker/Dockerfile index a577ab2a..65e3a202 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ #FROM debian:stretch FROM ubuntu:18.04 -LABEL maintainer="The Luxcore Developers <216k155@luxcore.io>" +LABEL maintainer="The Luxcore Developers " LABEL description="Dockerised Luxcore, built from Travis" RUN apt-get update && apt-get install -y software-properties-common unzip diff --git a/src/init.cpp b/src/init.cpp index 2dcf28e2..679fc8f4 100755 --- a/src/init.cpp +++ b/src/init.cpp @@ -401,7 +401,8 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-pid=", strprintf(_("Specify pid file (default: %s)"), "luxd.pid")); #endif strUsage += HelpMessageOpt("-record-log-opcodes", _("Logs all EVM LOG opcode operations to the file vmExecLogs.json")); - strUsage += HelpMessageOpt("-prune=", _("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex.") + " " + _("Warning: Reverting this setting requires re-downloading the entire blockchain.") + " " + _("(default: 0 = disable pruning blocks,") + " " + strprintf(_(">%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); + //Temporarily disabled until our chain doesn't grow in size + //strUsage += HelpMessageOpt("-prune=", _("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex.") + " " + _("Warning: Reverting this setting requires re-downloading the entire blockchain.") + " " + _("(default: 0 = disable pruning blocks,") + " " + strprintf(_(">%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); strUsage += HelpMessageOpt("-reindex-chainstate", _("Rebuild chain state from the currently indexed blocks")); strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup")); #if !defined(WIN32) @@ -821,7 +822,8 @@ bool AppInit2() fPrintToConsole = GetBoolArg("-printtoconsole", false); fLogTimestamps = GetBoolArg("-logtimestamps", true); fLogIPs = GetBoolArg("-logips", false); - int nIndexNum; + //Temporarily disabled until our chain doesn't grow in size + //int nIndexNum; if (mapArgs.count("-bind") || mapArgs.count("-whitebind")) { // when specifying an explicit binding address, you want to listen on it @@ -918,8 +920,8 @@ bool AppInit2() return InitError(_("Not enough file descriptors available.")); if (nFD - MIN_CORE_FILEDESCRIPTORS < nMaxConnections) nMaxConnections = nFD - MIN_CORE_FILEDESCRIPTORS; - - if (GetArg("-prune", 0)) { + //Temporarily disabled until our chain doesn't grow in size + /*if (GetArg("-prune", 0)) { std::string strLoadError; if (GetBoolArg("-txindex", DEFAULT_TXINDEX)) { strLoadError = _("You need to add txindex=0 to start pruning"); @@ -938,6 +940,7 @@ bool AppInit2() } } } + */ if (fRequestRestart) { LogPrintf("Restart requested. Exiting.\n"); return false;