Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v0.15.0.2 release tag #1

Open
wants to merge 92 commits into
base: 0.15.0.1-bitcore
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
43227a7
Rename configuration file
Nov 11, 2017
84a6619
Change 'Bitcoin server' to 'BitcoinGold' server
Nov 11, 2017
148b17d
Fix linearize-data.py for BTG block format.
h4x3rotab Nov 14, 2017
88b25f2
Merge pull request #190 from h4x3rotab/master
h4x3rotab Nov 15, 2017
5d1e5ce
Update README.md
h4x3rotab Nov 15, 2017
89990f6
Update Readme.md
gcasasi Nov 16, 2017
b787380
fix typo
lodelido Nov 20, 2017
e64d8a6
Merge pull request #217 from lodelido/master
h4x3rotab Nov 20, 2017
d31b9ec
Merge pull request #163 from D3m0nKingx/master
h4x3rotab Nov 20, 2017
0bddaae
Merge pull request #199 from gcasas84/patch-2
h4x3rotab Nov 20, 2017
ab0b108
Fixed gitian build
wilsonmeier Nov 21, 2017
e1686b7
Merge pull request #222 from wilsonmeier/gitian
h4x3rotab Nov 21, 2017
74dfb65
Clean gitian PGP keys from Core
Nov 26, 2017
e95395f
Add gitian PGP key: wjcloud
Nov 26, 2017
b86376b
Fix naming of build artifacts to bitcoin-gold-...
Nov 26, 2017
7f5f5cf
Fix inconsistencies and grammar in various files & remove old md guide
Nov 26, 2017
5c65da4
Remove lxcbr0 lines from gitian-build.sh
Nov 26, 2017
fe8b2b2
Rollback some changes
Nov 26, 2017
0206fe3
Merge pull request #210 from wjcloud/master
h4x3rotab Nov 26, 2017
24acc8f
Updated website url.
TheSorrow1 Nov 27, 2017
76ca343
Merge pull request #235 from TheSorrow1/master
h4x3rotab Nov 27, 2017
a42de87
Add pgp key for h4x3rotab
h4x3rotab Dec 1, 2017
62dcf91
Add pgp key for wilson
wilsonmeier Dec 4, 2017
47483fc
Merge pull request #244 from wilsonmeier/master
h4x3rotab Dec 5, 2017
dd6c3a2
Fixed integer comparison errors in equihash
Oct 24, 2017
cc22a3a
Fixed more integer comparison and removed useless const qualifier
wilsonmeier Dec 13, 2017
bdefcba
Fixed log output, removed unneeded cast and reverted variable type ch…
wilsonmeier Dec 16, 2017
e0b531e
Merge pull request #248 from wilsonmeier/integer-comparison
h4x3rotab Dec 17, 2017
1eaaab8
Fixed icons
wilsonmeier Dec 18, 2017
6073e6c
Fix the bad conditions to skip premine whitelist for regtest mode. (#…
ArthasWhite Dec 20, 2017
d3e4bc0
Correct block seriliazation in mininode
h4x3rotab Dec 10, 2017
56c9f02
Revert `-bootstrap` #1
h4x3rotab Dec 15, 2017
2b5ff3c
Revert `-bootstrap` #2
h4x3rotab Dec 15, 2017
c029f8c
Revert `-bootstrap` #3
h4x3rotab Dec 15, 2017
257cb0b
Revert `-bootstrap` #4
h4x3rotab Dec 15, 2017
7d67966
Rename configuration file
Nov 11, 2017
18ff27e
Change 'Bitcoin server' to 'BitcoinGold' server
Nov 11, 2017
ac70aac
Fix linearize-data.py for BTG block format.
h4x3rotab Nov 14, 2017
2ed59c6
Update README.md
h4x3rotab Nov 15, 2017
5b05115
fix typo
lodelido Nov 20, 2017
7667b86
Fixed gitian build
wilsonmeier Nov 21, 2017
a88b584
Clean gitian PGP keys from Core
Nov 26, 2017
520fbf8
Add gitian PGP key: wjcloud
Nov 26, 2017
755e3da
Fix naming of build artifacts to bitcoin-gold-...
Nov 26, 2017
10a8059
Fix inconsistencies and grammar in various files & remove old md guide
Nov 26, 2017
31002c8
Remove lxcbr0 lines from gitian-build.sh
Nov 26, 2017
af34251
Rollback some changes
Nov 26, 2017
510a348
Updated website url.
TheSorrow1 Nov 27, 2017
cba7f81
Add pgp key for h4x3rotab
h4x3rotab Dec 1, 2017
f67dc3b
Add pgp key for wilson
wilsonmeier Dec 4, 2017
fe2b886
Fixed integer comparison errors in equihash
Oct 24, 2017
4223bf8
Fixed more integer comparison and removed useless const qualifier
wilsonmeier Dec 13, 2017
36cb00d
Fixed log output, removed unneeded cast and reverted variable type ch…
wilsonmeier Dec 16, 2017
2dfe610
Fixed icons
wilsonmeier Dec 18, 2017
bdcd8fb
Fix the bad conditions to skip premine whitelist for regtest mode. (#…
ArthasWhite Dec 20, 2017
93aac79
Correct block seriliazation in mininode
h4x3rotab Dec 10, 2017
ec335b9
Revert `-bootstrap` #1
h4x3rotab Dec 15, 2017
2fd2acd
Revert `-bootstrap` #2
h4x3rotab Dec 15, 2017
5dc5f5d
Revert `-bootstrap` #3
h4x3rotab Dec 15, 2017
d1cb253
Revert `-bootstrap` #4
h4x3rotab Dec 15, 2017
beb972a
Change version to v0.15.0.2
h4x3rotab Dec 20, 2017
ccf2ba7
Fixed bitcoin.ico to make deterministic gitian windows builds
wilsonmeier Dec 22, 2017
6654fae
Fixed bitcoin.ico to make deterministic gitian windows builds
wilsonmeier Dec 22, 2017
a4ae785
add check to libsodium version in configure.ac
ArthasWhite Dec 24, 2017
5abe305
Merge pull request #258 from Arthaslixin/master
h4x3rotab Dec 24, 2017
f908fdc
Add 32x32 (256 color) logo to ico file
h4x3rotab Dec 25, 2017
d5522ed
Merge pull request #260 from h4x3rotab/icon
h4x3rotab Dec 25, 2017
21666ce
Add 32x32 (256 color) logo to ico file
h4x3rotab Dec 25, 2017
508a097
Leftover for the dedicated gitian build
Dec 26, 2017
660d183
Add pgp key for akx20000
Dec 26, 2017
301660d
Update release-process.md
Dec 26, 2017
7163d65
Remove clone lines
Dec 26, 2017
69ae802
Merge pull request #262 from akx20000a/gitian
h4x3rotab Dec 30, 2017
14a05f2
Update license year range to 2018
Dec 31, 2017
247c38d
Merge pull request #269 from akx20000a/2018
h4x3rotab Jan 1, 2018
8948963
Renaming of legacy config file to new name
wilsonmeier Jan 3, 2018
b64576a
Merge pull request #271 from wilsonmeier/master
h4x3rotab Jan 3, 2018
6830457
Add pgp key for shelvenzhou
shelvenzhou Jan 3, 2018
f6e8dec
Merge pull request #270 from shelvenzhou/master
h4x3rotab Jan 3, 2018
fd0b7fa
Merge branch 'master' into 0.15
h4x3rotab Jan 3, 2018
bd9ecb7
Missing quotes and new parameters
wilsonmeier Jan 3, 2018
b5f0274
Removed ".git" suffix from regex
wilsonmeier Jan 3, 2018
eb6a142
Correct wrong repo name in sentence
wilsonmeier Jan 3, 2018
64a5e86
Merge pull request #272 from wilsonmeier/master
h4x3rotab Jan 3, 2018
7741649
Merge branch 'master' into 0.15
h4x3rotab Jan 3, 2018
93e056b
Update README.md
h4x3rotab Jan 4, 2018
6401a2f
Bumped the version (#274)
TheSorrow1 Jan 5, 2018
171d71f
Bumped the version (#274)
h4x3rotab Jan 5, 2018
9266199
Replace Core's windows codesign cert by a self-signed one. (#275)
h4x3rotab Jan 5, 2018
4f688f5
Merge branch 'master' into 0.15
h4x3rotab Jan 5, 2018
00d401f
Merge remote-tracking branch 'btg/0.15.0.1-bitcore' into 0.15.0.1-bit…
Jan 24, 2018
ca171fb
Set '-dbmaxfilesize' optional
Jan 24, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<!--- Remove sections that do not apply -->

This issue tracker is only for technical issues related to bitcoin-core.
This issue tracker is only for technical issues related to bitcoin-gold.

General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com).

For reporting security issues, please see the official [Bitcoin Gold website](https://btcgpu.org/).
For reporting security issues, please see the official [Bitcoin Gold website](https://bitcoingold.org/).

### Describe the issue

Expand All @@ -23,7 +21,7 @@ Tell us what happens instead
### Screenshots.
If the issue is related to the GUI, screenshots can be added to this issue via drag & drop.

### What version of bitcoin-core are you using?
### What version of bitcoin-gold are you using?
List the version number/commit ID, and if it is an official binary, self compiled or a distribution package such as PPA.

### Machine specs:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ script:
- mkdir build && cd build
- ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make distdir VERSION=$HOST
- cd bitcoin-$HOST
- cd bitcoin-gold-$HOST
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
Expand Down
1 change: 1 addition & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright (c) 2009-2017 The Bitcoin Core developers
Copyright (c) 2017-2018 The Bitcoin Gold developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ Bitcoin Gold (codename BTCGPU) is a fork of the Bitcoin blockchain that will occ

At the predetermined block height, Bitcoin Gold miners will begin creating blocks with a new proof-of-work algorithm, and this will cause a bifurcation of the Bitcoin blockchain. The original Bitcoin blockchain will continue on unaltered, but a new branch of the blockchain will split off from the original chain. The new branch is a distinct blockchain with the same transaction history as Bitcoin up until the fork, but then diverges from it. As a result of this process, a new cryptocurrency will be born.


## Links

* Website: http://btcgpu.org
* Website: https://bitcoingold.org
* Tech Spec: https://github.com/BTCGPU/BTCGPU/wiki/Technical-Spec
* Slack: [invitation](https://join.slack.com/t/bitcoin-gold/shared_invite/enQtMjY1MzkzMzUxNjY4LWM1YmQ4MjZhZTQxMWE1ZDQyNjA4N2QwZTkyZjYzMjhiMzdlMmVkNjQ3NzZlZDdmMDE4NWIyY2JmYzdjYmE2MzA)
* TODO-list: https://trello.com/b/P1rLw1G9/bitcoin-gold-todos
29 changes: 22 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 15)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2017)
define(_COPYRIGHT_YEAR, 2018)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Gold]])
AC_INIT([Bitcoin Gold],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
AC_INIT([Bitcoin Gold],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/BTCGPU/BTCGPU/issues],[bitcoin-gold],[https://bitcoingold.org/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down Expand Up @@ -164,7 +164,7 @@ AC_ARG_ENABLE([lcov],
[enable lcov testing (default is no)])],
[use_lcov=yes],
[use_lcov=no])

AC_ARG_ENABLE([lcov-branch-coverage],
[AS_HELP_STRING([--enable-lcov-branch-coverage],
[enable lcov testing branch coverage (default is no)])],
Expand Down Expand Up @@ -719,6 +719,21 @@ if test x$use_upnp != xno; then
)
fi

dnl Check to find the libsodium headers/libraries
AC_CHECK_LIB(sodium, sodium_init,[],
[AC_MSG_ERROR([The Sodium crypto library libraries not found.])]
)

AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <sodium.h>
], [
#if SODIUM_LIBRARY_VERSION_MAJOR < 9 || SODIUM_LIBRARY_VERSION_MAJOR == 9 && SODIUM_LIBRARY_VERSION_MINOR < 5
# error
#endif
])],
[AC_MSG_RESULT([checking for version of libsodium... yes])],
[AC_MSG_ERROR([Wrong libsodium: version >= 1.0.13 required])])

BITCOIN_QT_INIT

dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
Expand Down Expand Up @@ -1288,7 +1303,7 @@ case ${OS} in
;;
esac

echo
echo
echo "Options used to compile and link:"
echo " with wallet = $enable_wallet"
echo " with gui / qt = $bitcoin_enable_qt"
Expand All @@ -1302,7 +1317,7 @@ echo " with bench = $use_bench"
echo " with upnp = $use_upnp"
echo " debug enabled = $enable_debug"
echo " werror = $enable_werror"
echo
echo
echo " target os = $TARGET_OS"
echo " build os = $BUILD_OS"
echo
Expand All @@ -1313,4 +1328,4 @@ echo " CXX = $CXX"
echo " CXXFLAGS = $CXXFLAGS"
echo " LDFLAGS = $LDFLAGS"
echo " ARFLAGS = $ARFLAGS"
echo
echo
4 changes: 2 additions & 2 deletions contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Contains files used to package bitcoind/bitcoin-qt
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.

### [Gitian-descriptors](/contrib/gitian-descriptors) ###
Notes on getting Gitian builds up and running using KVM.
Files used during the gitian build process.

### [Gitian-keys](/contrib/gitian-keys)
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
Expand All @@ -35,7 +35,7 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md)
Scripts and notes for Mac builds.

### [RPM](/contrib/rpm) ###
RPM spec file for building bitcoin-core on RPM based distributions
RPM spec file for building bitcoin-core on RPM based distributions.

### [Gitian-build](/contrib/gitian-build.sh) ###
Script for running full Gitian builds.
Expand Down
2 changes: 1 addition & 1 deletion contrib/bitcoind.bash-completion
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ _bitcoind() {
;;
*)

# only parse -help if senseful
# only parse -help if sensible
if [[ -z "$cur" || "$cur" =~ ^- ]]; then
local helpopts
helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/bitcoind.examples
Original file line number Diff line number Diff line change
@@ -1 +1 @@
debian/examples/bitcoin.conf
debian/examples/bitcoingold.conf
4 changes: 2 additions & 2 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low
bitcoin (0.3.19~dfsg-4) unstable; urgency=low

[ Micah Anderson ]
* Provide example bitcoin.conf.
* Add bitcoind(1) and bitcoin.conf(5) man pages.
* Provide example bitcoingold.conf.
* Add bitcoind(1) and bitcoingold.conf(5) man pages.

[ Jonas Smedegaard ]
* Ease backporting:
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Bitcoin
Upstream-Name: Bitcoin Gold
Upstream-Contact: Satoshi Nakamoto <[email protected]>
irc://#[email protected]
Source: https://github.com/bitcoin/bitcoin
Source: https://github.com/BTCGPU/BTCGPU

Files: *
Copyright: 2009-2017, Bitcoin Core Developers
Copyright: 2009-2017, Bitcoin Core Developers, 2017-2018 Bitcoin Gold Developers
License: Expat
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
as well as the numerous contributors to the project.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
##
## bitcoin.conf configuration file. Lines beginning with # are comments.
## bitcoingold.conf configuration file. Lines beginning with # are comments.
##

# Network-related settings:

# Run on the test network instead of the real bitcoin network.
# Run on the test network instead of the real bitcoingold network.
#testnet=0

# Run a regression test network
Expand Down Expand Up @@ -57,18 +57,18 @@
#maxconnections=

#
# JSON-RPC options (for controlling a running Bitcoin/bitcoind process)
# JSON-RPC options (for controlling a running BitcoinGold/bitcoind process)
#

# server=1 tells Bitcoin-Qt and bitcoind to accept JSON-RPC commands
# server=1 tells BitcoinGold-Qt and bitcoind to accept JSON-RPC commands
#server=0

# Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6.
# This option can be specified multiple times (default: bind to all interfaces)
#rpcbind=<addr>

# If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name
# is .cookie and found in the `-datadir` being used for bitcoind. This option is typically used
# is .cookie and found in the `-datadir` being used for bgoldd. This option is typically used
# when the server and client are run as the same user.
#
# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC api. The first
Expand All @@ -80,7 +80,7 @@
# using the output from the script in share/rpcuser/rpcuser.py after providing a username:
#
# ./share/rpcuser/rpcuser.py alice
# String to be appended to bitcoin.conf:
# String to be appended to bitcoingold.conf:
# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
# Your password:
# DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
Expand All @@ -92,7 +92,7 @@
# You can even add multiple entries of these to the server conf file, and client can use any of them:
# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99

# How many seconds bitcoin will wait for a complete RPC HTTP request.
# How many seconds bgoldd will wait for a complete RPC HTTP request.
# after the HTTP connection is established.
#rpcclienttimeout=30

Expand All @@ -103,16 +103,16 @@
# NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
# because the rpcpassword is transmitted over the network unencrypted.

# server=1 tells Bitcoin-Qt to accept JSON-RPC commands.
# it is also read by bitcoind to determine if RPC should be enabled
# server=1 tells BitcoinGold-Qt to accept JSON-RPC commands.
# it is also read by bgoldd to determine if RPC should be enabled
#rpcallowip=10.1.1.34/255.255.255.0
#rpcallowip=1.2.3.4/24
#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96

# Listen for RPC connections on this TCP port:
#rpcport=8332

# You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind
# You can use BitcoinGold or bgoldd to send commands to Bitcoin/bgoldd
# running on another host using this option:
#rpcconnect=127.0.0.1

Expand All @@ -126,7 +126,7 @@
# both prior transactions and several dozen future transactions.
#keypool=100

# Pay an optional transaction fee every time you send bitcoins. Transactions with fees
# Pay an optional transaction fee every time you send bitcoingolds. Transactions with fees
# are more likely than free transactions to be included in generated blocks, so may
# be validated sooner.
#paytxfee=0.00
Expand All @@ -140,7 +140,7 @@

# User interface options

# Start Bitcoin minimized
# Start BitcoinGold minimized
#min=1

# Minimize to the system tray
Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/check-doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
# list unsupported, deprecated and duplicate args as they need no documentation
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-dbcrashratio', '-forcecompactdb', '-dbmaxopenfiles', '-dbcompression'])
SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-dbcrashratio', '-forcecompactdb', '-dbmaxopenfiles', '-dbcompression', '-dbmaxfilesize'])

def main():
used = check_output(CMD_GREP_ARGS, shell=True)
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker_build/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Building bitcoind for fun and profit
Building bgoldd for fun and profit
-----

Run the script like this
Expand Down
5 changes: 2 additions & 3 deletions contrib/docker_build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ set -ex

docker build -t bitcoind_build .

docker run -v $BITCOINPATH:/bitcoin bitcoind_build /run.sh $2
docker run -v $BITCOINPATH:/BTCGPU bitcoind_build /run.sh $2

cd $BITCOINPATH/out

# renaming from Bitcoin name to Bitcore name.... stupid thing
rm -f $BITCOINPATH/out/bitcoin-0.14.0-x86_64-linux-gnu-debug.tar.gz
rm -f $BITCOINPATH/out/bitcoin-gold-0.15.0-x86_64-linux-gnu-debug.tar.gz
rename s/x86_64-pc-linux-gnu/linux64/ $BITCOINPATH/out/*.tar.gz
rename s/bitcoin-0/bgold-0/ $BITCOINPATH/out/*.tar.gz

sha256sum *.tar.gz > SHA256SUMS
gpg --digest-algo sha256 --clearsign SHA256SUMS
12 changes: 5 additions & 7 deletions contrib/docker_build/run_inside.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ update-locale LANG=en_US.UTF-8
export LANG='en_US.UTF-8'
export LC_ALL='en_US.UTF-8'
umask 002
export OUTDIR=/bitcoin/out
export OUTDIR=/BTCGPU/out
rm -rf $OUTDIR
mkdir $OUTDIR
chmod a+rwx $OUTDIR

cd bitcoin
cd BTCGPU
cd depends
# ???? I don't know
make libsodium
Expand Down Expand Up @@ -74,7 +74,7 @@ EOF
chmod +x ${WRAP_DIR}/${prog}
done

cd bitcoin
cd BTCGPU
make clean || true
rm -rf temp
BASEPREFIX=`pwd`/depends
Expand All @@ -96,13 +96,13 @@ export PATH=${WRAP_DIR}:${PATH}
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make clean
make dist
SOURCEDIST=`echo bitcoin-*.tar.gz`
SOURCEDIST=`echo bitcoin-gold*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
tar xf ../$SOURCEDIST
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
find bitcoin-gold* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd

ORIGPATH="$PATH"
Expand Down Expand Up @@ -133,5 +133,3 @@ for i in ${HOSTS}; do
done
mkdir -p $OUTDIR/src
mv $SOURCEDIST $OUTDIR/src


Loading