Skip to content
This repository has been archived by the owner on Apr 15, 2021. It is now read-only.

Commit

Permalink
Merge pull request #239 from aliascash/develop
Browse files Browse the repository at this point in the history
Official release build 4.3.0
  • Loading branch information
HLXEasy authored Oct 11, 2020
2 parents 38fb6b1 + d15564a commit 03567dc
Show file tree
Hide file tree
Showing 605 changed files with 15,169 additions and 13,110 deletions.
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

# Ignore git submodules as they produce an error
# if the clone is copied to the intermediate docker build container!
db4.8
Expand Down
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

src/version.cpp export-subst

# Shell scripts etc
Expand Down
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

src/*.exe
src/spectrecoin
src/spectrecoind
src/aliaswallet
src/aliaswalletd
src/test_spectre
src/build.h
src/.libs
Expand All @@ -14,9 +21,11 @@ src/.libs
*.dat
*.autosave
.spectrecoin
.aliaswallet
#compilation and Qt preprocessor part
*.qm
spectre
aliaswallet
#resources cpp
qrc_*.cpp
#moc
Expand Down Expand Up @@ -108,7 +117,7 @@ moc_predefs.h

# Temp build files
releaseNotesToDeploy.txt
Checksum-Spectrecoin-*
Checksum-Aliaswallet-*

*.dmg
.qmake.stash
5 changes: 5 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

#[submodule "tor"]
# path = tor
#url=https://github.com/spectrecoin/tor.git
Expand Down
97 changes: 97 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Alias
Upstream-Contact: Alias Developers <info@alias.cash>
Source: https://github.com/aliascash/alias

Files: doc/* Docker/*/*.patch src/qt/forms/* src/qt/locale/* src/qt/res/assets/css/* src/qt/res/assets/fonts/Footable/* src/qt/res/assets/fonts/Framework-icon/* src/qt/res/assets/icons/* src/qt/res/assets/img/* src/qt/res/assets/js/* src/qt/res/assets/plugins/framework/* src/qt/res/icons/* src/qt/res/images/* src/qt/res/src/* src/src.aps
Copyright: 2020 Alias Developers
Copyright: 2016 SpectreCoin Developers
License: MIT

Files: src/qt/res/bitcoin-qt.rc src/qt/res/index.html src/qt/res/main.qml
Copyright: 2020 Alias Developers
Copyright: 2016 SpectreCoin Developers
License: MIT

Files: src/qt/res/assets/fonts/FontAwesome/* src/qt/res/assets/fonts/Montserrat/* src/qt/res/assets/fonts/*.otf
Copyright: Dave Gandy http://fontawesome.io
Copyright: Google, Inc.
License: OFL-1.1

Files: src/qt/res/assets/plugins/bootstrapv3/*
Copyright: 2018 Twitter
License: MIT

Files: src/qt/res/assets/plugins/classie/*
Copyright: 2016 https://github.com/desandro/classie
License: MIT

Files: src/qt/res/assets/plugins/contextMenu/*
Copyright: 2013 Sudhanshu Yadav
License: MIT

Files: src/qt/res/assets/plugins/identicon/*
Copyright: 2013 Stewart Lord
License: BSD-2-Clause

Files: src/qt/res/assets/plugins/iscroll/*
Copyright: 2008 Matteo Spinelli http://cubiq.org
License: MIT

Files: src/qt/res/assets/plugins/jdenticon/*
Copyright: 2014 Daniel Mester Pirttijärvi
License: MIT

Files: src/qt/res/assets/plugins/markdown/*
Copyright: 2014 Simon Waldherr http://simon.waldherr.eu/
License: MIT

Files: src/qt/res/assets/plugins/md5/*
Copyright: 2014 Yi-Cyuan Chen
License: MIT

Files: src/qt/res/assets/plugins/pace/*
Copyright: 2016 https://github.com/HubSpot/pace
License: MIT

Files: src/qt/res/assets/plugins/pnglib/*
Copyright: 2010 Robert Eisele
License: BSD-2-Clause

Files: src/qt/res/assets/plugins/qrcode/*
Copyright: 2015 Twitter @davidshimjs
License: MIT

Files: src/qt/res/assets/plugins/modernizr*
Copyright: 2016 https://modernizr.com/
License: MIT

Files: src/qt/res/assets/plugins/jquery*
Copyright: 2014 jQuery Foundation and other contributors
License: MIT

Files: src/qt/res/assets/plugins/emojione/*
Copyright: 2016 EmojiOne
License: CC-BY-4.0

Files: src/qt/res/assets/plugins/footable/*
Copyright: 2014 Steven Usher & Brad Vincent
License: MIT

Files: src/qt/res/assets/plugins/shajs/*
Copyright: 2008 Brian Turek
License: BSD-2-Clause

Files: src/test/data/*
Copyright: 2020 Alias Developers
Copyright: 2016 SpectreCoin Developers
License: MIT

Files: m4/*
Copyright: 2020 Alias Developers
Copyright: 2016 SpectreCoin Developers
License: MIT

Files: src/lz4/*
Copyright: 2011 Yann Collet
License: BSD-2-Clause
5 changes: 5 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

[main]
host = https://www.transifex.com

Expand Down
41 changes: 21 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
How to contribute to XSPEC
============================
# Licensing

The XSPEC project operates with an open contributor model where anyone is welcome to contribute towards development. This can be contributions in the form of peer reviews, testing and patches via pull requests. We will actively encourage community involvement and reward good work. This document explains the practical process and guidelines for contributing to XSPEC.
* SPDX-FileCopyrightText: © 2020 Alias Developers
* SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
* SPDX-License-Identifier: MIT

In terms of XSPEC code governance structure, there are no privileged individuals or developers. XSPEC as most open source projects naturally revolves around meritocracy where longer term contributors gain more trust from the developer community. However, a certain hierarchy is necessary for practical purposes.
# How to contribute to Alias

Therefore, there will be repository “curators” who are responsible for merging pull requests as well as the XSPEC Core Team who are responsible for the release cycle, moderation and appointment of "curators".
The Alias project operates with an open contributor model where anyone is welcome to contribute towards development. This can be contributions in the form of peer reviews, testing and patches via pull requests. We will actively encourage community involvement and reward good work. This document explains the practical process and guidelines for contributing to Alias.

In terms of Alias code governance structure, there are no privileged individuals or developers. Alias as most open source projects naturally revolves around meritocracy where longer term contributors gain more trust from the developer community. However, a certain hierarchy is necessary for practical purposes.

Contributor Workflow
--------------------
Therefore, there will be repository “curators” who are responsible for merging pull requests as well as the Alias Core Team who are responsible for the release cycle, moderation and appointment of "curators".

The XSPEC codebase is maintained using the “contributor workflow” where everyone contributes patch proposals using “pull requests”. This facilitates social contribution, easy testing and peer review. There may be circumstances where the XSPEC Core Team will update the code if needed.

# Contributor Workflow

The Alias codebase is maintained using the “contributor workflow” where everyone contributes patch proposals using “pull requests”. This facilitates social contribution, easy testing and peer review. There may be circumstances where the Alias Core Team will update the code if needed.

To contribute a patch, the workflow is as follows:

Expand Down Expand Up @@ -46,8 +50,7 @@ The body of the pull request should contain enough description about what the pa
At this stage one should expect comments and review from other contributors. You can add more commits to your pull request by committing them locally and pushing to your fork until you have satisfied all feedback. If your pull request is accepted for merging, you may be asked by a curator to squash and or rebase your commits before it will be merged. The length of time required for peer review is unpredictable and will vary from patch to patch.


Pull Request Philosophy
-----------------------
# Pull Request Philosophy

Patchsets should always be focused. For example, a pull request could add a feature, fix a bug, or refactor code; but not a mixture. Please also avoid super pull requests which attempt to do too much, are overly large, or overly complex as this makes review difficult.

Expand All @@ -63,15 +66,14 @@ Refactoring is a necessary part of any software project's evolution. The followi

There are three categories of refactoring, code only moves, code style fixes, code refactoring. In general refactoring pull requests should not mix these three kinds of activity in order to make refactoring pull requests easy to review and uncontroversial. In all cases, refactoring PRs must not change the behaviour of code within the pull request (bugs must be preserved as is).

Project curators aim for a quick turnaround on refactoring pull requests, so where possible keep them short, uncomplex and easy to verify.
Project curators aim for a quick turnaround on refactoring pull requests, so where possible keep them short, uncomplex and easy to verify.


"Decision Making" Process
-------------------------
# "Decision Making" Process

The following applies to code changes to the XSPEC Core project (and related projects such as libsecp256k1), and is not to be confused with overall XSPEC Network Protocol consensus changes.
The following applies to code changes to the Alias Core project (and related projects such as libsecp256k1), and is not to be confused with overall Alias Network Protocol consensus changes.

Whether a pull request is merged into the XSPEC Core rests with the project merge curators and ultimately the XSPEC Core Team.
Whether a pull request is merged into the Alias Core rests with the project merge curators and ultimately the Alias Core Team.

Curators will take into consideration if a patch is in line with the general principles of the project; meets the minimum standards for inclusion; and will judge the general consensus of contributors.

Expand All @@ -84,7 +86,7 @@ In general, all pull requests must:
- not break the existing test suite;
- where bugs are fixed, where possible, there should be unit tests demonstrating the bug and also proving the fix. This helps prevent regression.

Patches that change XSPEC consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive discussions. While each case will be different, one should be prepared to expend more time and effort than for other kinds of patches because of increased peer review and consensus building requirements.
Patches that change Alias consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive discussions. While each case will be different, one should be prepared to expend more time and effort than for other kinds of patches because of increased peer review and consensus building requirements.


### Peer Review
Expand All @@ -103,12 +105,11 @@ Project curators reserve the right to weigh the opinions of peer reviewers using

Where a patch set affects consensus critical code, the bar will be set much higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code.

Where a patch set proposes to change the XSPEC consensus, it must have been discussed extensively on the appropriate Discord channel, and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the curators and the XSPEC Core Team.
Where a patch set proposes to change the Alias consensus, it must have been discussed extensively on the appropriate Discord channel, and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the curators and the Alias Core Team.


Release Policy
--------------
# Release Policy

The XSPEC Core Team is the release manager for each XSPEC Core release.
The Alias Core Team is the release manager for each Alias Core release.

This document is subject to change and will be updated.
37 changes: 22 additions & 15 deletions Docker/CentOS/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

### At first perform source build ###
FROM spectreproject/spectre-builder-centos:1.2 as build
FROM aliascash/alias-wallet-builder-centos-8:1.8 as build
MAINTAINER HLXEasy <hlxeasy@gmail.com>

# Build parameters
Expand All @@ -8,43 +13,45 @@ ARG BUILD_THREADS="6"
# Runtime parameters
ENV BUILD_THREADS=$BUILD_THREADS

COPY . /spectre
COPY . /alias-wallet

RUN cd /spectre \
RUN cd /alias-wallet \
&& mkdir db4.8 leveldb \
&& patch < Docker/Fedora/QT5BinaryPath.patch \
&& ./autogen.sh \
&& ./configure \
--enable-gui \
--with-qt5=/usr/include/qt5 \
&& make -j${BUILD_THREADS}
&& make -j${BUILD_THREADS} \
&& strip /alias-wallet/src/aliaswalletd \
&& strip /alias-wallet/src/aliaswallet

### Now upload binaries to GitHub ###
FROM spectreproject/github-uploader:latest
FROM aliascash/github-uploader:latest
MAINTAINER HLXEasy <hlxeasy@gmail.com>

ARG GITHUB_TOKEN=1234567
ARG SPECTRECOIN_RELEASE=latest
ARG SPECTRECOIN_REPOSITORY=spectre
ARG ALIAS_RELEASE=latest
ARG ALIAS_REPOSITORY=alias-wallet
ARG GIT_COMMIT=unknown
ARG REPLACE_EXISTING_ARCHIVE=''
#ENV GITHUB_TOKEN=${GITHUB_TOKEN}
ENV ARCHIVE=Spectrecoin-${SPECTRECOIN_RELEASE}-${GIT_COMMIT}-CentOS.tgz
ENV CHKSUM_FILE=Checksum-Spectrecoin-CentOS.txt
ENV ARCHIVE=Alias-${ALIAS_RELEASE}-${GIT_COMMIT}-CentOS.tgz
ENV CHKSUM_FILE=Checksum-Alias-CentOS-8.txt

RUN mkdir -p /filesToUpload/usr/local/bin

COPY --from=build /spectre/src/spectrecoind /filesToUpload/usr/local/bin/
COPY --from=build /spectre/src/spectre /filesToUpload/usr/local/bin/spectrecoin
COPY --from=build /spectre/scripts/createChecksums.sh /tmp/
COPY --from=build /alias-wallet/src/aliaswalletd /filesToUpload/usr/local/bin/
COPY --from=build /alias-wallet/src/aliaswallet /filesToUpload/usr/local/bin/
COPY --from=build /alias-wallet/scripts/createChecksums.sh /tmp/

RUN cd /filesToUpload \
&& tar czf ${ARCHIVE} . \
&& github-release upload \
--user spectrecoin \
--user aliascash \
--security-token "${GITHUB_TOKEN}" \
--repo "${SPECTRECOIN_REPOSITORY}" \
--tag "${SPECTRECOIN_RELEASE}" \
--repo "${ALIAS_REPOSITORY}" \
--tag "${ALIAS_RELEASE}" \
--name "${ARCHIVE}" \
--file "/filesToUpload/${ARCHIVE}" \
${REPLACE_EXISTING_ARCHIVE} \
Expand Down
15 changes: 11 additions & 4 deletions Docker/CentOS/Dockerfile_noUpload
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# SPDX-FileCopyrightText: © 2020 Alias Developers
# SPDX-FileCopyrightText: © 2016 SpectreCoin Developers
#
# SPDX-License-Identifier: MIT

### At first perform source build ###
FROM spectreproject/spectre-builder-centos:1.2
FROM aliascash/alias-wallet-builder-centos-8:1.8
MAINTAINER HLXEasy <hlxeasy@gmail.com>

# Build parameters
Expand All @@ -8,13 +13,15 @@ ARG BUILD_THREADS="6"
# Runtime parameters
ENV BUILD_THREADS=$BUILD_THREADS

COPY . /spectre
COPY . /alias-wallet

RUN cd /spectre \
RUN cd /alias-wallet \
&& mkdir db4.8 leveldb \
&& patch < Docker/Fedora/QT5BinaryPath.patch \
&& ./autogen.sh \
&& ./configure \
--enable-gui \
--with-qt5=/usr/include/qt5 \
&& make -j${BUILD_THREADS}
&& make -j${BUILD_THREADS} \
&& strip /alias-wallet/src/aliaswalletd \
&& strip /alias-wallet/src/aliaswallet
Loading

0 comments on commit 03567dc

Please sign in to comment.