Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Commit

Permalink
mandatory update
Browse files Browse the repository at this point in the history
Updating a lot of typo's, vars and some needed stuff for more stability
  • Loading branch information
crypto-node committed Jul 9, 2019
1 parent f99f947 commit 34745a8
Show file tree
Hide file tree
Showing 133 changed files with 320 additions and 292 deletions.
11 changes: 3 additions & 8 deletions CHANGELOG.md
@@ -1,11 +1,6 @@
# BARE Changelog

## Version 1.2.0
Wallet upgrade.
## v 1.1.0
#Mandatoy update!
Update several issues in main code.

- **Changed** Wallet UI colors, fonts, icons, splashscreen, positioning.
- **Removed** Coinmix & Darksend
- **Removed** "Start ALL" button - because it was too easy to hit accidentally.

## Version 1.1.2
Chain upgrade.
2 changes: 1 addition & 1 deletion COPYING
Expand Up @@ -2,7 +2,7 @@ Copyright (c) 2009-2015 Bitcoin Developers
Copyright (c) 2014-2015 Dash Developers
Copyright (c) 2015-2017 PIVX Developers
Copyright (c) 2015-2017 ALQO Developers
Copyright (c) 2019 Bare Developers
Copyright (c) 2017-2019 Bare 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
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -27,8 +27,8 @@ Webpage: https://bare.network

Explorer: http://explorer.bare.network

Discord: https://discord.gg/hr6hMH
Discord: https://discord.gg/HqHutDk

Twitter: https://twitter.com/bare_crypto

BitcoinTalk: https://bitcointalk.org/index.php?topic=5149503
BitcoinTalk: https://bitcointalk.org/index.php?topic=5149503
12 changes: 12 additions & 0 deletions contrib/debian/bare-qt.desktop
@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Name=Bare
Comment=Bare P2P Cryptocurrency
Comment[fr]=Bare, monnaie virtuelle cryptographique pair à pair
Comment[tr]=Bare, eşten eşe kriptografik sanal para birimi
Exec=bare-qt %u
Terminal=false
Type=Application
Icon=bare128
MimeType=x-scheme-handler/bare;
Categories=Office;Finance;
2 changes: 1 addition & 1 deletion contrib/debian/examples/bare.conf
Expand Up @@ -73,7 +73,7 @@
# because the rpcpassword is transmitted over the network unencrypted.

# server=1 tells Bare-Qt to accept JSON-RPC commands.
# it is also read by bared to determine if RPC should be enabled
# it is also read by bared 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
Expand Down
4 changes: 2 additions & 2 deletions contrib/devtools/README.md
Expand Up @@ -19,7 +19,7 @@ For example:
./github-merge.py 3077

(in any git repository) will help you merge pull request #3077 for the
nocoinerdev2/bare-core repository.
barecoin/bare-core repository.

What it does:
* Fetch master and the pull request.
Expand All @@ -39,7 +39,7 @@ Setup

Configuring the github-merge tool for the Bare repository is done in the following way:

git config githubmerge.repository nocoinerdev2/bare-core
git config githubmerge.repository barecoin/bare-core
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey mykeyid (if you want to GPG sign)

Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-build.sh
Expand Up @@ -247,7 +247,7 @@ then
fi

# Set up build
pushd ./bare-core/
pushd ./bare-core
git fetch
git checkout ${COMMIT}
popd
Expand Down
19 changes: 17 additions & 2 deletions contrib/gitian-descriptors/gitian-linux.yml
Expand Up @@ -5,7 +5,7 @@ suites:
- "trusty"
architectures:
- "amd64"
packages:
packages:
- "curl"
- "g++-aarch64-linux-gnu"
- "g++-4.8-aarch64-linux-gnu"
Expand Down Expand Up @@ -33,6 +33,7 @@ remotes:
"dir": "bare-core"
files: []
script: |
WRAP_DIR=$HOME/wrapped
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
Expand All @@ -41,6 +42,7 @@ script: |
HOST_CFLAGS="-O2 -g"
HOST_CXXFLAGS="-O2 -g"
HOST_LDFLAGS=-static-libstdc++
export QT_RCC_TEST=1
export GZIP="-9n"
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
Expand All @@ -52,6 +54,7 @@ script: |
export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
fi
function create_global_faketime_wrappers {
for prog in ${FAKETIME_PROGS}; do
echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
Expand All @@ -62,6 +65,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
}
function create_per-host_faketime_wrappers {
for i in $HOSTS; do
for prog in ${FAKETIME_HOST_PROGS}; do
Expand All @@ -74,19 +78,24 @@ script: |
done
done
}
# Faketime for depends so intermediate results are comparable
export PATH_orig=${PATH}
create_global_faketime_wrappers "2000-01-01 12:00:00"
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
export PATH=${WRAP_DIR}:${PATH}
EXTRA_INCLUDES_BASE=$WRAP_DIR/extra_includes
mkdir -p $EXTRA_INCLUDES_BASE
# x86 needs /usr/include/i386-linux-gnu/asm pointed to /usr/include/x86_64-linux-gnu/asm,
# but we can't write there. Instead, create a link here and force it to be included in the
# search paths by wrapping gcc/g++.
mkdir -p $EXTRA_INCLUDES_BASE/i686-pc-linux-gnu
rm -f $WRAP_DIR/extra_includes/i686-pc-linux-gnu/asm
ln -s /usr/include/x86_64-linux-gnu/asm $EXTRA_INCLUDES_BASE/i686-pc-linux-gnu/asm
for prog in gcc g++; do
rm -f ${WRAP_DIR}/${prog}
cat << EOF > ${WRAP_DIR}/${prog}
Expand Down Expand Up @@ -116,11 +125,13 @@ script: |
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
unset HOST_ID_SALT
done
# Faketime for binaries
export PATH=${PATH_orig}
create_global_faketime_wrappers "${REFERENCE_DATETIME}"
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
# Create the release tarball using (arbitrarily) the first host
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
Expand All @@ -133,6 +144,7 @@ script: |
tar xf ../$SOURCEDIST
find bare-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
popd
ORIGPATH="$PATH"
# Extract the release tarball into a dir for each host and build
for i in ${HOSTS}; do
Expand All @@ -142,19 +154,22 @@ script: |
INSTALLPATH=`pwd`/installed/${DISTNAME}
mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
make ${MAKEOPTS}
make install DESTDIR=${INSTALLPATH}
cd installed
find . -name "lib*.la" -delete
find . -name "lib*.a" -delete
rm -rf ${DISTNAME}/lib/pkgconfig
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 \;
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 ../../
rm -rf distsrc-${i}
done
mkdir -p $OUTDIR/src
mkdir -p $OUTDIR/src
mv $SOURCEDIST $OUTDIR/src
mv $SOURCEDIST $OUTDIR/src
20 changes: 14 additions & 6 deletions contrib/gitian-descriptors/gitian-win.yml
@@ -1,11 +1,11 @@
---
name: "xcompay-win-1.2"
name: "bare-win-1.1"
enable_cache: true
suites:
- "trusty"
architectures:
- "amd64"
packages:
packages:
- "curl"
- "g++"
- "git-core"
Expand All @@ -27,12 +27,13 @@ remotes:
files: []
script: |
WRAP_DIR=$HOME/wrapped
HOSTS="i686-w64-mingw32 x86_64-w64-mingw32"
HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests"
FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip objcopy"
FAKETIME_PROGS="date makensis zip"
HOST_CFLAGS="-O2 -g"
HOST_CXXFLAGS="-O2 -g"
export QT_RCC_TEST=1
export GZIP="-9n"
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
Expand All @@ -44,6 +45,7 @@ script: |
export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
fi
function create_global_faketime_wrappers {
for prog in ${FAKETIME_PROGS}; do
echo '#!/bin/bash' > ${WRAP_DIR}/${prog}
Expand All @@ -54,6 +56,7 @@ script: |
chmod +x ${WRAP_DIR}/${prog}
done
}
function create_per-host_faketime_wrappers {
for i in $HOSTS; do
for prog in ${FAKETIME_HOST_PROGS}; do
Expand All @@ -66,6 +69,7 @@ script: |
done
done
}
function create_per-host_linker_wrapper {
# This is only needed for trusty, as the mingw linker leaks a few bytes of
# heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900
Expand All @@ -89,6 +93,7 @@ script: |
done
done
}
# Faketime for depends so intermediate results are comparable
export PATH_orig=${PATH}
create_global_faketime_wrappers "2000-01-01 12:00:00"
Expand All @@ -109,12 +114,14 @@ script: |
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
create_per-host_linker_wrapper "${REFERENCE_DATETIME}"
export PATH=${WRAP_DIR}:${PATH}
# Create the release tarball using (arbitrarily) the first host
./autogen.sh
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
make dist
SOURCEDIST=`echo bare-*.tar.gz`
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
# Correct tar file order
mkdir -p temp
pushd temp
Expand All @@ -123,6 +130,7 @@ script: |
mkdir -p $OUTDIR/src
cp ../$SOURCEDIST $OUTDIR/src
popd
ORIGPATH="$PATH"
# Extract the release tarball into a dir for each host and build
for i in ${HOSTS}; do
Expand All @@ -132,22 +140,22 @@ script: |
INSTALLPATH=`pwd`/installed/${DISTNAME}
mkdir -p ${INSTALLPATH}
tar --strip-components=1 -xf ../$SOURCEDIST
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
make ${MAKEOPTS}
make deploy
make install DESTDIR=${INSTALLPATH}
cp -f bare-*setup*.exe $OUTDIR/
cd installed
# mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
find . -name "lib*.a" -delete
rm -rf ${DISTNAME}/lib/pkgconfig
find ${DISTNAME}/bin -type f -executable -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
# find ${DISTNAME}/lib -type f -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
find ${DISTNAME}/lib -type f -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
find ${DISTNAME} -not -name "*.dbg" -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
find ${DISTNAME} -name "*.dbg" -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}-debug.zip
cd ../../
rm -rf distsrc-${i}
done
cd $OUTDIR
rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-keys/fuzzbawls-key.gpg
Expand Up @@ -243,7 +243,7 @@ puFbw3FvLA+Y8CuYncyTu/8AtVy13ZI3gr3N6O4e2R3hOGIAP0zTUupZLtS7kryD
mlsreW6tDKikqseWJ7VTBwwI6dM1yT3NI6IVQU4qoww+SuatE7Zse2aRpFY5Ayeh
qEFiJQGTjikbgYPQd6RgFfcD8h7UPEzsoHTOTimldj2NfQLcTTyXLr0GEFaP9kSa
hc72LR2wI3y9ifRfVqoWFzHbq6k4ULgfzrtR4h0rStMtUlInljXesUQydxHc9B/O
ssVUlTSUFqzuwdKNXWWyLmkeFhdTxzXMXlWEWAkQ/wCWh9TXR/8ACN6N/wA+Kf8A
ssVUlTSUFqzuwdKNXWWyLmkeFhdTxzWBRlWEWAkQ/wCWh9TXR/8ACN6N/wA+Kf8A
fVcbeePHl8PvE0Pkzyf6sJ2H1rlP+Ekv/wDnq/8A31XmKjVnrI9XnS0SNaONrMb1
OwKc4Heuo8PXq392kYOLoKfmPGR6fh1rBaFQ2XO7HNFnO9tqC3EKYIPy4qZaoT1N
XxDcXGieLbpoyXiZlk2Hnggcr+IrgJbC7+1yyCGaeNiWEiKSOfX0r0LVYv7ZgWbe
Expand Down
2 changes: 1 addition & 1 deletion contrib/qt_translations.py
Expand Up @@ -18,5 +18,5 @@
l1 = set([ re.search(r'qt_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d1, 'qt_*.qm')) ])
l2 = set([ re.search(r'bitcoin_(.*).qm', f).group(1) for f in glob.glob(os.path.join(d2, 'bitcoin_*.qm')) ])

print(",".join(sorted(l1.intersection(l2))))
print ",".join(sorted(l1.intersection(l2)))

10 changes: 5 additions & 5 deletions doc/README.md
Expand Up @@ -4,7 +4,7 @@ Bare Core
Setup
-----

[Bare Core]http://bit.bares/ is the original Bare client and it builds the backbone of the network. However, it downloads and stores the entire history of Bare 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. Thankfully you only have to do this once.
[Bare Core]https://bare.network/ is the original Bare client and it builds the backbone of the network. However, it downloads and stores the entire history of Bare 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. Thankfully you only have to do this once.

Running
-------
Expand All @@ -29,8 +29,8 @@ Drag Bare-Qt to your applications folder, and then run Bare-Qt.

* See the documentation at the [Bare Wiki](https://en.bitcoin.it/wiki/Main_Page) ***TODO***
for help and more information.
* Ask for help on [BitcoinTalk](https://bitcointalk.org/index.php?topic=2976421).
* Join our Discord server [Bare Discord](https://discord.gg/DHYsG6j).
* Ask for help on [BitcoinTalk](https://bitcointalk.org/index.php?topic=5149503).
* Join our Discord server [Bare Discord](https://discord.gg/HqHutDk).

Building
--------
Expand Down Expand Up @@ -58,8 +58,8 @@ The Bare repo's [root README](https://github.com/BareCrypto/bare-core/bare-core/

### Resources

* Discuss on the [BitcoinTalk](https://bitcointalk.org/index.php?topic=2976421).
* Join the [Bare Discord](https://discord.gg/DHYsG6j)
* Discuss on the [BitcoinTalk](https://bitcointalk.org/index.php?topic=5149503).
* Join the [Bare Discord](https://discord.gg/HqHutDk)

### Miscellaneous

Expand Down
2 changes: 1 addition & 1 deletion doc/developer-notes.md
Expand Up @@ -429,7 +429,7 @@ Git and github tips
[remote "upstream-pull"]
fetch = +refs/pull/*:refs/remotes/upstream-pull/*
url = git@github.com:nocoinerdev2/bare-core.git
url = git@github.com:barecoin/bare-core.git
This will add an `upstream-pull` remote to your git repository, which can be fetched using `git fetch --all`
or `git fetch upstream-pull`. Afterwards, you can use `upstream-pull/NUMBER/head` in arguments to `git show`,
Expand Down
2 changes: 1 addition & 1 deletion doc/gitian-building.md
Expand Up @@ -410,6 +410,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
[nocoinerdev2/gitian.sigs](https://github.com/BareCrypto/bare-core/gitian.sigs/) repository, or if that's not possible to create a pull
[barecoin/gitian.sigs](https://github.com/BareCrypto/bare-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.
4 changes: 2 additions & 2 deletions doc/translation_process.md
Expand Up @@ -9,7 +9,7 @@ Transifex is setup to monitor the GitHub repo for updates, and when code contain

Multiple language support is critical in assisting Bare's global adoption, and growth. One of Bare's greatest strengths is cross-border money transfers, any help making that easier is greatly appreciated.

See the [Transifex Bare project](https://www.transifex.com/nocoinerdev2/bare-project-translations/) to assist in translations.
See the [Transifex Bare project](https://www.transifex.com/barecoin/bare-project-translations/) to assist in translations.

### Writing code with translations

Expand Down Expand Up @@ -50,7 +50,7 @@ git commit

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 Bare translation project at [https://www.transifex.com/nocoinerdev2/bare-project-translations/](https://www.transifex.com/nocoinerdev2/bare-project-translations/).
You can find the Bare translation project at [https://www.transifex.com/barecoin/bare-project-translations/](https://www.transifex.com/barecoin/bare-project-translations/).

### Installing the Transifex client command-line tool

Expand Down

0 comments on commit 34745a8

Please sign in to comment.