Skip to content

Commit

Permalink
Merge pull request #49 from contribute-torque/torque_rebrand
Browse files Browse the repository at this point in the history
Rebrand Stellite to Torque
  • Loading branch information
hayzamjs authored Mar 22, 2019
2 parents 7daee90 + 265f835 commit 6305e88
Show file tree
Hide file tree
Showing 177 changed files with 942 additions and 941 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ endif()

cmake_minimum_required(VERSION 2.8.7)

project(stellite)
project(torque)

function (die msg)
if (NOT WIN32)
Expand Down Expand Up @@ -336,7 +336,7 @@ if(SANITIZE)
endif()

# Set default blockchain storage location:
# memory was the default in Cryptonote before Stellite implemented LMDB, it still works but is unnecessary.
# memory was the default in Cryptonote before Torque implemented LMDB, it still works but is unnecessary.
# set(DATABASE memory)
set(DATABASE lmdb)

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists_IOS.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Portions Copyright (c) 2017-2018, The MoNerO Project
# This file is based off of the https://code.google.com/archive/p/ios-cmake/
# It has been altered for Stellite iOS development
# It has been altered for Torque iOS development
#
#
# Options:
Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to Stellite
# Contributing to Torque

A good way to help is to test, and report bugs. See
[How to Report Bugs Effectively (by Simon Tatham)](https://www.chiark.greenend.org.uk/~sgtatham/bugs.html)
Expand All @@ -15,7 +15,7 @@ of software solid and usable.
Patches are preferably to be sent via a Github pull request. If that
can't be done, patches in "git format-patch" format can be sent
(eg, posted to fpaste.org with a long enough timeout and a link
posted to #stellite-dev on irc.freenode.net).
posted to #torque-dev on irc.freenode.net).

Patches should be self contained. A good rule of thumb is to have
one patch per separate issue, feature, or logical change. Also, no
Expand Down Expand Up @@ -67,9 +67,9 @@ You should have received a copy of the GNU General Public License along with thi

The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in RFC 2119.

The "Stellite Maintainer Team" is defined in this document as the following users:
The "Torque Maintainer Team" is defined in this document as the following users:
- fluffypony
- stellitemooo
- torquemooo
- hyc

## Goals
Expand Down Expand Up @@ -126,17 +126,17 @@ C4 is meant to provide a reusable optimal collaboration model for open source so
- To request changes, a user SHOULD log an issue on the project Platform issue tracker.
- The user or Contributor SHOULD write the issue by describing the problem they face or observe.
- The user or Contributor SHOULD seek consensus on the accuracy of their observation, and the value of solving the problem.
- Users SHALL NOT log feature requests, ideas, or suggestions unrelated to Stellite code or Stellite's dependency code or Stellite's potential/future dependency code or research which successfully implements Stellite.
- Users SHALL NOT log feature requests, ideas, or suggestions unrelated to Torque code or Torque's dependency code or Torque's potential/future dependency code or research which successfully implements Torque.
- Users SHALL NOT log any solutions to problems (verifiable or hypothetical) of which are not explicitly documented and/or not provable and/or cannot be reasonably proven.
- Thus, the release history of the project SHALL be a list of meaningful issues logged and solved.
- To work on an issue, a Contributor SHALL fork the project repository and then work on their forked repository.
- To submit a patch, a Contributor SHALL create a Platform pull request back to the project.
- A Contributor SHALL NOT commit changes directly to the project.
- To discuss a patch, people MAY comment on the Platform pull request, on the commit, or elsewhere.
- To accept or reject a patch, a Maintainer SHALL use the Platform interface.
- Maintainers SHOULD NOT merge their own patches except in exceptional cases, such as non-responsiveness from other Maintainers for an extended period (more than 30 days) or unless urgent as defined by the Stellite Maintainers Team.
- Maintainers SHOULD NOT merge their own patches except in exceptional cases, such as non-responsiveness from other Maintainers for an extended period (more than 30 days) or unless urgent as defined by the Torque Maintainers Team.
- Maintainers SHALL NOT make value judgments on correct patches unless the Maintainer (as may happen in rare circumstances) is a core code developer.
- Maintainers MUST NOT merge pull requests in less than 168 hours (1 week) unless deemed urgent by at least 2 people from the Stellite Maintainer Team.
- Maintainers MUST NOT merge pull requests in less than 168 hours (1 week) unless deemed urgent by at least 2 people from the Torque Maintainer Team.
- The Contributor MAY tag an issue as "Ready" after making a pull request for the issue.
- The user who created an issue SHOULD close the issue after checking the patch is successful.
- Maintainers SHOULD ask for improvements to incorrect patches and SHOULD reject incorrect patches if the Contributor does not respond constructively.
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ RUN set -ex && \
COPY --from=builder /src/build/release/bin /usr/local/bin/

# Contains the blockchain
VOLUME /root/.bitstellite
VOLUME /root/.bittorque

# Generate your wallet via accessing the container and run:
# cd /wallet
# stellite-wallet-cli
# torque-wallet-cli
VOLUME /wallet

EXPOSE 18080
EXPOSE 18081

ENTRYPOINT ["stellited", "--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=18080", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=18081", "--non-interactive", "--confirm-external-bind"]
ENTRYPOINT ["torqued", "--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=18080", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=18081", "--non-interactive", "--confirm-external-bind"]

2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.

PROJECT_NAME = "Stellite"
PROJECT_NAME = "Torque"

# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
Expand Down
12 changes: 6 additions & 6 deletions README.i18n.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Stellite daemon internationalization
Torque daemon internationalization
==================================

The Stellite command line tools can be translated in various languages. If you wish to contribute and need help/support, contact the [Stellite Localization Workgroup on Taiga](https://taiga.getstellite.org/project/erciccione-stellite-localization/) or come chat on `#stellite-translations` (Freenode/IRC, riot/matrix, MatterMost)
The Torque command line tools can be translated in various languages. If you wish to contribute and need help/support, contact the [Torque Localization Workgroup on Taiga](https://taiga.gettorque.org/project/erciccione-torque-localization/) or come chat on `#torque-translations` (Freenode/IRC, riot/matrix, MatterMost)

In order to use the same translation workflow as the [Stellite Core GUI](https://github.com/stellite-project/stellite-core), they use Qt Linguist translation files. However, to avoid the dependencies on Qt this normally implies, they use a custom loader to read those files at runtime.
In order to use the same translation workflow as the [Torque Core GUI](https://github.com/torque-project/torque-core), they use Qt Linguist translation files. However, to avoid the dependencies on Qt this normally implies, they use a custom loader to read those files at runtime.

### Tools for translators

Expand All @@ -19,19 +19,19 @@ To update ts files after changing source code:

To add a new language, eg Spanish (ISO code es):

cp translations/stellite.ts translations/stellite_es.ts
cp translations/torque.ts translations/torque_es.ts

To edit translations for Spanish:

linguist translations/stellite_es.ts
linguist translations/torque_es.ts

To build translations after modifying them:

./utils/translations/build-translations.sh

To test a translation:

LANG=es ./build/release/bin/stellite-wallet-cli
LANG=es ./build/release/bin/torque-wallet-cli

To add new translatable strings in the source code:

Expand Down
50 changes: 25 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Stellite
# Torque

Copyright (c) 2017-2019, The Stellite Project
Copyright (c) 2017-2019, The Torque Project

Copyright (c) 2017, The Electroneum Project

Expand All @@ -15,48 +15,48 @@ Portions Copyright (c) 2017 The Masari Project

## Development Resources

- Web: [stellite.cash](https://stellite.cash)
- Web: [torque.cash](https://torque.cash)
- Discord: [https://discord.gg/C9JVYHA](https://discord.gg/C9JVYHA)
- Mail: [admin@stellite.cash](mailto:admin@stellite.cash)
- Github: [https://github.com/stellitecoin/Stellite/](https://github.com/stellitecoin/Stellite/)
- Mail: [admin@torque.cash](mailto:admin@torque.cash)
- Github: [https://github.com/torquecoin/Torque/](https://github.com/torquecoin/Torque/)

## Introduction

Stellite is a private, secure, untraceable cryptocurrency.We bring the best from the whole cryptonight space, both from Monero and Electroneum. In Stellite You are your bank, you control your funds, and nobody can trace your transfers unless you allow them to do so. Stellite is a soft fork of monero trying to implement the best of proposals in the entire privacy coin ecosystem.
Torque is a private, secure, untraceable cryptocurrency.We bring the best from the whole cryptonight space, both from Monero and Electroneum. In Torque You are your bank, you control your funds, and nobody can trace your transfers unless you allow them to do so. Torque is a soft fork of monero trying to implement the best of proposals in the entire privacy coin ecosystem.

**Features:** We are trying to do things no cryptocurrency has ever done before. Full blown small device mining for instance smartphones, tablets, smart tv etc etc are in our scopes. P2P distributed seed lists are the next target after that. All this coupled with the below given features will make stellite one of the best cryptocurrencies on the market.
**Features:** We are trying to do things no cryptocurrency has ever done before. Full blown small device mining for instance smartphones, tablets, smart tv etc etc are in our scopes. P2P distributed seed lists are the next target after that. All this coupled with the below given features will make torque one of the best cryptocurrencies on the market.

**Privacy:** Stellite uses a cryptographically sound system to allow you to send and receive funds without your transactions being easily revealed on the blockchain (the ledger of transactions that everyone has). This ensures that your purchases, receipts, and all transfers remain absolutely private by default.
**Privacy:** Torque uses a cryptographically sound system to allow you to send and receive funds without your transactions being easily revealed on the blockchain (the ledger of transactions that everyone has). This ensures that your purchases, receipts, and all transfers remain absolutely private by default.

**Security:** Using the power of a distributed peer-to-peer consensus network, every transaction on the network is cryptographically secured. Individual wallets have a 25 word mnemonic seed that is only displayed once, and can be written down to backup the wallet. Wallet files are encrypted with a passphrase to ensure they are useless if stolen.

**Untraceability:** By taking advantage of ring signatures, a special property of a certain type of cryptography, Stellite is able to ensure that transactions are not only untraceable, but have an optional measure of ambiguity that ensures that transactions cannot easily be tied back to an individual user or computer.
**Untraceability:** By taking advantage of ring signatures, a special property of a certain type of cryptography, Torque is able to ensure that transactions are not only untraceable, but have an optional measure of ambiguity that ensures that transactions cannot easily be tied back to an individual user or computer.

**Timeline:** We are going to be implementing true small hashrate device mining and P2P distributed seed lists without hardcode by Q2 of 2018.

## About this Project

This is the core implementation of Stellite. It is open source and completely free to use without restrictions, except for those specified in the license agreement below. There are no restrictions on anyone creating an alternative implementation of Stellite that uses the protocol and network in a compatible manner.
This is the core implementation of Torque. It is open source and completely free to use without restrictions, except for those specified in the license agreement below. There are no restrictions on anyone creating an alternative implementation of Torque that uses the protocol and network in a compatible manner.

As with many development projects, the repository on Github is considered to be the "staging" area for the latest changes. Before changes are merged into that branch on the main repository, they are tested by individual developers in their own branches, submitted as a pull request, and then subsequently tested by contributors who focus on testing and code reviews. That having been said, the repository should be carefully considered before using it in a production environment, unless there is a patch in the repository for a particular show-stopping issue you are experiencing. It is generally a better idea to use a tagged release for stability.

**Anyone is welcome to contribute to Stellite's codebase!** If you have a fix or code change, feel free to submit it as a pull request directly to the "master" branch. In cases where the change is relatively small or does not affect other parts of the codebase it may be merged in immediately by any one of the collaborators. On the other hand, if the change is particularly large or complex, it is expected that it will be discussed at length either well in advance of the pull request being submitted, or even directly on the pull request.
**Anyone is welcome to contribute to Torque's codebase!** If you have a fix or code change, feel free to submit it as a pull request directly to the "master" branch. In cases where the change is relatively small or does not affect other parts of the codebase it may be merged in immediately by any one of the collaborators. On the other hand, if the change is particularly large or complex, it is expected that it will be discussed at length either well in advance of the pull request being submitted, or even directly on the pull request.

## Supporting the Project

Stellite development can be supported directly through donations.
Torque development can be supported directly through donations.

Both Stellite and Bitcoin donations can be made to donate.getstellite.org if using a client that supports the [OpenAlias](https://openalias.org) standard
Both Torque and Bitcoin donations can be made to donate.gettorque.org if using a client that supports the [OpenAlias](https://openalias.org) standard

The Stellite donation address is: `Se3dRf8ZTUXKYivaTFU4KYczPcmMcwPZWEQ5HZmj3RRviFJ3w1mNhtgCWkn6VsnQcMBX1hyCUjZVuSo8X7yJTSYj1joP84WoT`
The Torque donation address is: `Se3dRf8ZTUXKYivaTFU4KYczPcmMcwPZWEQ5HZmj3RRviFJ3w1mNhtgCWkn6VsnQcMBX1hyCUjZVuSo8X7yJTSYj1joP84WoT`

The Bitcoin donation address is: `1XTLY5LqdBXRW6hcHtnuMU7c68mAyW6qm`
The Bitcoin donation address is: `1XTCY5LqdBXRW6hcHtnuMU7c68mAyW6qm`

## License

See [LICENSE](LICENSE).

## Compiling Stellite from Source
## Compiling Torque from Source

### Dependencies
The following table summarizes the tools and libraries required to build. A
Expand Down Expand Up @@ -99,23 +99,23 @@ Debian / Ubuntu one liner for all dependencies

Clone recursively to pull-in needed submodule(s):

`$ git clone --recursive https://github.com/stellitecoin/Stellite`
`$ git clone --recursive https://github.com/torquecoin/Torque`

If you already have a repo cloned, initialize and update:

`$ cd stellite && git submodule init && git submodule update`
`$ cd torque && git submodule init && git submodule update`

### Build instructions

Stellite uses the CMake build system and a top-level [Makefile](Makefile) that
Torque uses the CMake build system and a top-level [Makefile](Makefile) that
invokes cmake commands as needed.

#### On Linux and OS X

* Install the dependencies
* Change to the root of the source code directory, change to the most recent release branch, and build:

cd stellite
cd torque
make

*Optional*: If your machine has several cores and enough memory, enable
Expand All @@ -127,16 +127,16 @@ invokes cmake commands as needed.
https://github.com/zeromq/cppzmq to `/usr/local/include` should fix that error.

*Note*: The instructions above will compile the most stable release of the
Stellite software. If you would like to use and test the most recent software,
Torque software. If you would like to use and test the most recent software,
use ```git checkout master```. The master branch may contain updates that are
both unstable and incompatible with release software, though testing is always
encouraged.

* The resulting executables can be found in `build/release/bin`

* Add `PATH="$PATH:$HOME/stellite/build/release/bin"` to `.profile`
* Add `PATH="$PATH:$HOME/torque/build/release/bin"` to `.profile`

* Run Stellite with `stellited --detach`
* Run Torque with `torqued --detach`

* **Optional**: build and run the test suite to verify the binaries:

Expand Down Expand Up @@ -200,13 +200,13 @@ application.

* To git clone, run:

git clone --recursive https://github.com/stellitecoin/Stellite.git
git clone --recursive https://github.com/torquecoin/Torque.git

**Building**

* Change to the cloned directory, run:

cd stellite
cd torque

* If you are on a 64-bit system, run:

Expand Down
2 changes: 1 addition & 1 deletion cmake/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.

PROJECT_NAME = Stellite
PROJECT_NAME = Torque

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
Expand Down
2 changes: 1 addition & 1 deletion contrib/codefresh/codefresh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
BuildingDockerImage:
title: Building Docker Image
type: build
image_name: stellite
image_name: torque
working_directory: ./
tag: '${{CF_BRANCH_TAG_NORMALIZED}}'
dockerfile: Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions contrib/epee/include/file_io_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
// Microsoft Visual C/C++ Runtime Library, and this method does NOT offer any
// Unicode support.

// Stellite code that would want to continue to use the normal file stream classes
// Torque code that would want to continue to use the normal file stream classes
// but WITH Unicode support could therefore not solve this problem on its own,
// but 2 different projects from 2 different maintaining groups would need changes
// in this particular direction - something probably difficult to achieve and
Expand Down Expand Up @@ -178,7 +178,7 @@ namespace file_io_utils
inline
bool append_string_to_file(const std::string& path_to_file, const std::string& str)
{
// No special Windows implementation because so far not used in Stellite code
// No special Windows implementation because so far not used in Torque code
try
{
std::ofstream fstream;
Expand Down
2 changes: 1 addition & 1 deletion contrib/epee/include/net/abstract_tcp_server2.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
@file
@author from CrypoNote (see copyright below; Andrey N. Sabelnikov)
@stellite rfree
@torque rfree
@brief the connection templated-class for one peer connection
*/
// Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
Expand Down
4 changes: 2 additions & 2 deletions contrib/epee/include/net/abstract_tcp_server2.inl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
@file
@author from CrypoNote (see copyright below; Andrey N. Sabelnikov)
@stellite rfree
@torque rfree
@brief the connection templated-class for one peer connection
*/
// Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
Expand Down Expand Up @@ -461,7 +461,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
if (!all_ok) {
MDEBUG("do_send() DONE ***FAILED*** from packet="<<cb<<" B for ptr="<<ptr);
MDEBUG("do_send() SEND was aborted in middle of big package - this is mostly harmless "
<< " (e.g. peer closed connection) but if it causes trouble tell us at #stellite-dev. " << cb);
<< " (e.g. peer closed connection) but if it causes trouble tell us at #torque-dev. " << cb);
return false; // partial failure in sending
}
pos = pos+len;
Expand Down
Loading

0 comments on commit 6305e88

Please sign in to comment.