Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 0 additions & 37 deletions .github/issue_template.md

This file was deleted.

90 changes: 52 additions & 38 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,23 @@ jobs:
uses: actions/checkout@v2
- name: Install Required Packages
run: |
sudo apt-get update
sudo apt-get install -y python3-zmq
sudo apt-get update
sudo apt-get install -y libboost-all-dev libdb-dev libdb++-dev libevent-dev
sudo apt-get install -y unzip
sudo apt-get install -y build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils cmake libgmp-dev python3 cmake
sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
sudo apt-get install software-properties-common
sudo add-apt-repository ppa:bitcoin/bitcoin
sudo apt-get update
sudo apt-get install libdb4.8-dev libdb4.8++-dev
sudo wget https://github.com/codablock/bls-signatures/archive/v20181101.zip
unzip v20181101.zip
cd bls-signatures-20181101
sudo cmake .
sudo make install
cd ..
- name: Create Distribution Tarball
run: |
./autogen.sh
Expand All @@ -45,7 +60,6 @@ jobs:
runs-on: ubuntu-18.04
env:
ARTIFACT_DIR: linux-binaries
TEST_LOG_ARTIFACT_DIR: test-logs
steps:
- name: Getting Source
uses: actions/download-artifact@v1
Expand All @@ -60,22 +74,28 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y python3-zmq
sudo apt-get install -y libboost-all-dev libdb-dev libdb++-dev libevent-dev
sudo apt-get install -y unzip
sudo apt-get install -y build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils cmake libgmp-dev python3 cmake
sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
sudo apt-get install software-properties-common
sudo add-apt-repository ppa:bitcoin/bitcoin
sudo apt-get update
sudo apt-get install libdb4.8-dev libdb4.8++-dev
sudo wget https://github.com/codablock/bls-signatures/archive/v20181101.zip
unzip v20181101.zip
cd bls-signatures-20181101
sudo cmake .
sudo make install
cd ..
- name: Build Dependencies
run: make -C depends -j$(nproc)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Build Index
- name: Build index
run: |
./configure --disable-jni --enable-elysium --enable-tests --with-comparison-tool=no --prefix=$(realpath depends/x86_64-pc-linux-gnu)
./configure --disable-jni --enable-elysium --enable-tests --with-comparison-tool=no --prefix=`pwd`/depends/x86_64-pc-linux-gnu
make -j$(nproc)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Run Unit Tests
run: make check
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Run RPC Tests
env:
TIMEOUT: 600
run: qa/pull-tester/rpc-tests.py -extended
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Prepare Files for Artifact
run: |
mkdir -p $ARTIFACT_DIR
Expand All @@ -85,27 +105,6 @@ jobs:
with:
name: linux-binaries
path: ${{ env.ARTIFACT_DIR }}
- name: Prepare Test Logs for Artifact
if: failure()
run: |
tor_log=$SOURCE_ARTIFACT/src/tor/test-suite.log
index_log=$SOURCE_ARTIFACT/src/test-suite.log

mkdir -p $TEST_LOG_ARTIFACT_DIR

if test -f $tor_log; then
mv $tor_log $TEST_LOG_ARTIFACT_DIR/tor.log
fi

if test -f $index_log; then
mv $index_log $TEST_LOG_ARTIFACT_DIR/index.log
fi
- name: Upload Test Logs Artifact
if: failure()
uses: actions/upload-artifact@v1
with:
name: test-logs
path: ${{ env.TEST_LOG_ARTIFACT_DIR }}
build-windows:
name: Build for Windows
needs: create-source-distribution
Expand All @@ -125,17 +124,32 @@ jobs:
- name: Install Required Packages
run: |
sudo apt-get update
sudo apt-get install -y python3-zmq
sudo apt-get install -y libboost-all-dev libdb-dev libdb++-dev libevent-dev
sudo apt-get install -y unzip
sudo apt-get install -y build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils cmake libgmp-dev python3 cmake
sudo apt-get install libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev
sudo apt-get install software-properties-common
sudo add-apt-repository ppa:bitcoin/bitcoin
sudo apt-get update
sudo apt-get install libdb4.8-dev libdb4.8++-dev
sudo apt-get install -y g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64
- name: Switch MinGW GCC and G++ to POSIX Threading
- name: Switch MinGW GCC and G++ to POSIX Threading and Install BLS
run: |
sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
- name: Build Dependencies
run: make -C depends -j$(nproc) HOST=x86_64-w64-mingw32
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Build Index
run: |
./configure --disable-jni --enable-elysium --prefix=$(realpath depends/x86_64-w64-mingw32)
- name: Build index
run: |
sudo wget https://github.com/codablock/bls-signatures/archive/v20181101.zip
unzip v20181101.zip
cd bls-signatures-20181101
sudo cmake .
sudo make install
cd ..
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure --disable-jni --enable-elysium --prefix=/
make -j$(nproc)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Prepare Files for Artifact
Expand Down Expand Up @@ -170,7 +184,7 @@ jobs:
- name: Build Dependencies
run: make -C depends -j$(sysctl -n hw.activecpu)
working-directory: ${{ env.SOURCE_ARTIFACT }}
- name: Build Index
- name: Build index
run: |
./configure --disable-jni --enable-elysium --prefix=$(grealpath depends/x86_64-apple-darwin*)
make -j$(sysctl -n hw.activecpu)
Expand All @@ -183,4 +197,4 @@ jobs:
uses: actions/upload-artifact@v1
with:
name: mac-binaries
path: ${{ env.ARTIFACT_DIR }}
path: ${{ env.ARTIFACT_DIR }}
18 changes: 9 additions & 9 deletions src/elysium/activation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void ClearActivations()
}

/**
* Determines whether the sender is an authorized source for Exodus Core feature activation.
* Determines whether the sender is an authorized source for Elysium Core feature activation.
*
* The option "-elysiumactivationallowsender=source" can be used to whitelist additional sources,
* and the option "-elysiumactivationignoresender=source" can be used to ignore a source.
Expand All @@ -147,11 +147,11 @@ bool CheckActivationAuthorization(const std::string& sender)
"scriptPubKey": "a91498a2d17e08ac677dc220b92e0b79406f2f441c2487",
"sigsrequired": 4,
"addresses": [
"1883ZMsRJfzKNozUBJBTCxQ7EaiNioNDWz", // Zathras - zathras@exodus.foundation - Project maintainer, developer
"1883ZMsRJfzKNozUBJBTCxQ7EaiNioNDWz", // Zathras - zathras@elysium.foundation - Project maintainer, developer
"1HHv91gRxqBzQ3gydMob3LU8hqXcWoLfvd", // dexx - dexx@bitwatch.co - Project maintainer, developer
"1oyvGmABkeFRUECn2t8DEZPes6F7Gsc9T", // J.R. Willett - jr@exodus.foundation - Founder and Board Member
"17xr7sbehYY4YSZX9yuJe6gK9rrdRrZx26", // Craig Sellars - craig@exodus.foundation - Technologist and Board Member
"16oDZYCspsczfgKXVj3xyvsxH21NpEj94F" // Adam Chamely - adam@exodus.foundation - Project maintainer, developer
"1oyvGmABkeFRUECn2t8DEZPes6F7Gsc9T", // J.R. Willett - jr@elysium.foundation - Founder and Board Member
"17xr7sbehYY4YSZX9yuJe6gK9rrdRrZx26", // Craig Sellars - craig@elysium.foundation - Technologist and Board Member
"16oDZYCspsczfgKXVj3xyvsxH21NpEj94F" // Adam Chamely - adam@elysium.foundation - Project maintainer, developer
],
*/
whitelisted.insert("48UM25xTXCxPRwnv36YjjJNaAK4whKR8Rd");
Expand Down Expand Up @@ -198,11 +198,11 @@ bool CheckDeactivationAuthorization(const std::string& sender)
"script" : "multisig",
"sigsrequired" : 3,
"addresses" : [
"1883ZMsRJfzKNozUBJBTCxQ7EaiNioNDWz", // Zathras - zathras@exodus.foundation - Project maintainer, developer
"1883ZMsRJfzKNozUBJBTCxQ7EaiNioNDWz", // Zathras - zathras@elysium.foundation - Project maintainer, developer
"1HHv91gRxqBzQ3gydMob3LU8hqXcWoLfvd", // dexx - dexx@bitwatch.co - Project maintainer, developer
"1oyvGmABkeFRUECn2t8DEZPes6F7Gsc9T", // J.R. Willett - jr@exodus.foundation - Founder and Board Member
"17xr7sbehYY4YSZX9yuJe6gK9rrdRrZx26", // Craig Sellars - craig@exodus.foundation - Technologist and Board Member
"16oDZYCspsczfgKXVj3xyvsxH21NpEj94F" // Adam Chamely - adam@exodus.foundation - Project maintainer, developer
"1oyvGmABkeFRUECn2t8DEZPes6F7Gsc9T", // J.R. Willett - jr@elysium.foundation - Founder and Board Member
"17xr7sbehYY4YSZX9yuJe6gK9rrdRrZx26", // Craig Sellars - craig@elysium.foundation - Technologist and Board Member
"16oDZYCspsczfgKXVj3xyvsxH21NpEj94F" // Adam Chamely - adam@elysium.foundation - Project maintainer, developer
],
*/
whitelisted.insert("48UM25xTXCxPRwnv36YjjJNaAK4whKR8Rd");
Expand Down
4 changes: 2 additions & 2 deletions src/elysium/doc/rpc-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ Returns the token balance for a given address and property.
**Example:**

```bash
$ omnicore-cli "omni_getbalance", "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P" 1
$ omnicore-cli "omni_getbalance", "1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P" 1
```

---
Expand Down Expand Up @@ -734,7 +734,7 @@ Returns a list of all token balances for a given address.
**Example:**

```bash
$ omnicore-cli "omni_getallbalancesforaddress" "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P"
$ omnicore-cli "omni_getallbalancesforaddress" "1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P"
```

---
Expand Down
14 changes: 7 additions & 7 deletions src/elysium/elysium.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1985,9 +1985,9 @@ int elysium_init()
boost::filesystem::path tradePath = GetDataDir() / "MP_tradelist";
boost::filesystem::path spPath = GetDataDir() / "MP_spinfo";
boost::filesystem::path stoPath = GetDataDir() / "MP_stolist";
boost::filesystem::path elysiumTXDBPath = GetDataDir() / "Exodus_TXDB";
boost::filesystem::path feesPath = GetDataDir() / "EXODUS_feecache";
boost::filesystem::path feeHistoryPath = GetDataDir() / "EXODUS_feehistory";
boost::filesystem::path elysiumTXDBPath = GetDataDir() / "Elysium_TXDB";
boost::filesystem::path feesPath = GetDataDir() / "ELYSIUM_feecache";
boost::filesystem::path feeHistoryPath = GetDataDir() / "ELYSIUM_feehistory";
if (boost::filesystem::exists(persistPath)) boost::filesystem::remove_all(persistPath);
if (boost::filesystem::exists(txlistPath)) boost::filesystem::remove_all(txlistPath);
if (boost::filesystem::exists(tradePath)) boost::filesystem::remove_all(tradePath);
Expand All @@ -2008,9 +2008,9 @@ int elysium_init()
p_txlistdb = new CMPTxList(GetDataDir() / "MP_txlist", fReindex);
sigmaDb = new SigmaDatabase(GetDataDir() / "MP_sigma", fReindex);
_my_sps = new CMPSPInfo(GetDataDir() / "MP_spinfo", fReindex);
p_ElysiumTXDB = new CElysiumTransactionDB(GetDataDir() / "Exodus_TXDB", fReindex);
p_feecache = new CElysiumFeeCache(GetDataDir() / "EXODUS_feecache", fReindex);
p_feehistory = new CElysiumFeeHistory(GetDataDir() / "EXODUS_feehistory", fReindex);
p_ElysiumTXDB = new CElysiumTransactionDB(GetDataDir() / "Elysium_TXDB", fReindex);
p_feecache = new CElysiumFeeCache(GetDataDir() / "ELYSIUM_feecache", fReindex);
p_feehistory = new CElysiumFeeHistory(GetDataDir() / "ELYSIUM_feehistory", fReindex);

MPPersistencePath = GetDataDir() / "MP_persist";
TryCreateDirectory(MPPersistencePath);
Expand Down Expand Up @@ -2196,7 +2196,7 @@ bool elysium_handler_tx(const CTransaction& tx, int nBlock, unsigned int idx, co
*/
bool elysium::UseEncodingClassC(size_t nDataSize)
{
size_t nTotalSize = nDataSize + magic.size(); // Marker "exodus"
size_t nTotalSize = nDataSize + magic.size(); // Marker "elysium"
bool fDataEnabled = GetBoolArg("-datacarrier", true);
int nBlockNow = GetHeight();
if (!IsAllowedOutputType(TX_NULL_DATA, nBlockNow)) {
Expand Down
4 changes: 2 additions & 2 deletions src/elysium/log.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <vector>

// Default log files
const std::string LOG_FILENAME = "exodus.log";
const std::string LOG_FILENAME = "elysium.log";

// Options
static const long LOG_BUFFERSIZE = 8000000; // 8 MB
Expand Down Expand Up @@ -127,7 +127,7 @@ static int ConsolePrint(const std::string& str)
/**
* Returns path for debug log file.
*
* The log file can be specified via startup option "--elysiumlogfile=/path/to/exodus.log",
* The log file can be specified via startup option "--elysiumlogfile=/path/to/elysium.log",
* and if none is provided, then the client's datadir is used as default location.
*/
static boost::filesystem::path GetLogPath()
Expand Down
4 changes: 2 additions & 2 deletions src/elysium/packetencoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

namespace elysium {

// could not change to "elysium" because of previous exodus transactions
const std::array<unsigned char, 6> magic = { 0x65, 0x78, 0x6f, 0x64, 0x75, 0x73 }; // "exodus"
// could not change to "elysium" because of previous elysium transactions
const std::array<unsigned char, 6> magic = { 0x65, 0x78, 0x6f, 0x64, 0x75, 0x73 }; // "elysium"

// PacketKeyGenerator Implementation.

Expand Down
12 changes: 6 additions & 6 deletions src/elysium/rpc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ UniValue elysium_getfeeshare(const JSONRPCRequest& request)
" ...\n"
"]\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_getfeeshare", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1")
+ HelpExampleRpc("elysium_getfeeshare", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1")
+ HelpExampleCli("elysium_getfeeshare", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1")
+ HelpExampleRpc("elysium_getfeeshare", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1")
);

std::string address;
Expand Down Expand Up @@ -819,8 +819,8 @@ UniValue elysium_getbalance(const JSONRPCRequest& request)
" \"reserved\" : \"n.nnnnnnnn\" (string) the amount reserved by sell offers and accepts\n"
"}\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_getbalance", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1")
+ HelpExampleRpc("elysium_getbalance", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1")
+ HelpExampleCli("elysium_getbalance", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1")
+ HelpExampleRpc("elysium_getbalance", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1")
);

std::string address = ParseAddress(request.params[0]);
Expand Down Expand Up @@ -909,8 +909,8 @@ UniValue elysium_getallbalancesforaddress(const JSONRPCRequest& request)
" ...\n"
"]\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_getallbalancesforaddress", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\"")
+ HelpExampleRpc("elysium_getallbalancesforaddress", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\"")
+ HelpExampleCli("elysium_getallbalancesforaddress", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\"")
+ HelpExampleRpc("elysium_getallbalancesforaddress", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\"")
);

std::string address = ParseAddress(request.params[0]);
Expand Down
16 changes: 8 additions & 8 deletions src/elysium/rpctx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1291,8 +1291,8 @@ UniValue elysium_sendfreeze(const JSONRPCRequest& request)
"\nResult:\n"
"\"hash\" (string) the hex-encoded transaction hash\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_sendfreeze", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\" \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\" 1 0")
+ HelpExampleRpc("elysium_sendfreeze", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\", \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\", 1, 0")
+ HelpExampleCli("elysium_sendfreeze", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\" \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\" 1 0")
+ HelpExampleRpc("elysium_sendfreeze", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\", \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\", 1, 0")
);

// obtain parameters & info
Expand Down Expand Up @@ -1343,8 +1343,8 @@ UniValue elysium_sendunfreeze(const JSONRPCRequest& request)
"\nResult:\n"
"\"hash\" (string) the hex-encoded transaction hash\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_sendunfreeze", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\" \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\" 1 0")
+ HelpExampleRpc("elysium_sendunfreeze", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\", \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\", 1, 0")
+ HelpExampleCli("elysium_sendunfreeze", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\" \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\" 1 0")
+ HelpExampleRpc("elysium_sendunfreeze", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\", \"3HTHRxu3aSDV4deakjC7VmsiUp7c6dfbvs\", 1, 0")
);

// obtain parameters & info
Expand Down Expand Up @@ -1395,8 +1395,8 @@ UniValue elysium_sendactivation(const JSONRPCRequest& request)
"\nResult:\n"
"\"hash\" (string) the hex-encoded transaction hash\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_sendactivation", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1 370000 999")
+ HelpExampleRpc("elysium_sendactivation", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1, 370000, 999")
+ HelpExampleCli("elysium_sendactivation", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1 370000 999")
+ HelpExampleRpc("elysium_sendactivation", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1, 370000, 999")
);

// obtain parameters & info
Expand Down Expand Up @@ -1439,8 +1439,8 @@ UniValue elysium_senddeactivation(const JSONRPCRequest& request)
"\nResult:\n"
"\"hash\" (string) the hex-encoded transaction hash\n"
"\nExamples:\n"
+ HelpExampleCli("elysium_senddeactivation", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1")
+ HelpExampleRpc("elysium_senddeactivation", "\"1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1")
+ HelpExampleCli("elysium_senddeactivation", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\" 1")
+ HelpExampleRpc("elysium_senddeactivation", "\"1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P\", 1")
);

// obtain parameters & info
Expand Down
Loading