diff --git a/.github/issue_template.md b/.github/issue_template.md deleted file mode 100644 index 28c181499..000000000 --- a/.github/issue_template.md +++ /dev/null @@ -1,37 +0,0 @@ - - -This issue tracker is only for technical issues related to bitcoin-core. - -General bitcoin questions and/or support requests and are best directed to the [Bitcoin StackExchange](https://bitcoin.stackexchange.com). - -For reporting security issues, please read instructions at [https://bitcoincore.org/en/contact/](https://bitcoincore.org/en/contact/). - -### Describe the issue - -### Can you reliably reproduce the issue? -#### If so, please list the steps to reproduce below: -1. -2. -3. - -### Expected behaviour -Tell us what should happen - -### Actual behaviour -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? -List the version number/commit ID, and if it is an official binary, self compiled or a distribution package such as PPA. - -### Machine specs: -- OS: -- CPU: -- RAM: -- Disk size: -- Disk Type (HD/SDD): - -### Any extra information that might be useful in the debugging process. -This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred. diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index 669ceb201..0fe336b22 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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) @@ -183,4 +197,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: mac-binaries - path: ${{ env.ARTIFACT_DIR }} + path: ${{ env.ARTIFACT_DIR }} \ No newline at end of file diff --git a/src/elysium/activation.cpp b/src/elysium/activation.cpp index 2f4560256..506174c89 100644 --- a/src/elysium/activation.cpp +++ b/src/elysium/activation.cpp @@ -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. @@ -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"); @@ -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"); diff --git a/src/elysium/doc/rpc-api.md b/src/elysium/doc/rpc-api.md index fc379d6dd..cef98ba7c 100644 --- a/src/elysium/doc/rpc-api.md +++ b/src/elysium/doc/rpc-api.md @@ -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 ``` --- @@ -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" ``` --- diff --git a/src/elysium/elysium.cpp b/src/elysium/elysium.cpp index 80709269c..f294d2e1d 100644 --- a/src/elysium/elysium.cpp +++ b/src/elysium/elysium.cpp @@ -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); @@ -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); @@ -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)) { diff --git a/src/elysium/log.cpp b/src/elysium/log.cpp index 8460af2cc..36aa1dddf 100644 --- a/src/elysium/log.cpp +++ b/src/elysium/log.cpp @@ -16,7 +16,7 @@ #include // 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 @@ -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() diff --git a/src/elysium/packetencoder.cpp b/src/elysium/packetencoder.cpp index a9a3d3af3..2845504b7 100644 --- a/src/elysium/packetencoder.cpp +++ b/src/elysium/packetencoder.cpp @@ -22,8 +22,8 @@ namespace elysium { -// could not change to "elysium" because of previous exodus transactions -const std::array magic = { 0x65, 0x78, 0x6f, 0x64, 0x75, 0x73 }; // "exodus" +// could not change to "elysium" because of previous elysium transactions +const std::array magic = { 0x65, 0x78, 0x6f, 0x64, 0x75, 0x73 }; // "elysium" // PacketKeyGenerator Implementation. diff --git a/src/elysium/rpc.cpp b/src/elysium/rpc.cpp index 8945edede..58a1c4a22 100644 --- a/src/elysium/rpc.cpp +++ b/src/elysium/rpc.cpp @@ -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; @@ -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]); @@ -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]); diff --git a/src/elysium/rpctx.cpp b/src/elysium/rpctx.cpp index 8620e6a99..8212a6425 100644 --- a/src/elysium/rpctx.cpp +++ b/src/elysium/rpctx.cpp @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/src/elysium/sp.cpp b/src/elysium/sp.cpp index 1510b868d..48d244043 100644 --- a/src/elysium/sp.cpp +++ b/src/elysium/sp.cpp @@ -71,17 +71,17 @@ CMPSPInfo::CMPSPInfo(const boost::filesystem::path& path, bool fWipe) implied_elysium.num_tokens = 700000; implied_elysium.category = "N/A"; implied_elysium.subcategory = "N/A"; - implied_elysium.name = "Exodus"; + implied_elysium.name = "Elysium"; implied_elysium.url = "https://www.indexchain.org"; - implied_elysium.data = "Exodus serve as the binding between Index, smart properties and contracts created on the Exodus Layer."; + implied_elysium.data = "Elysium serve as the binding between Index, smart properties and contracts created on the Elysium Layer."; implied_telysium.issuer = GetSystemAddress().ToString(); implied_telysium.prop_type = ELYSIUM_PROPERTY_TYPE_DIVISIBLE; implied_telysium.num_tokens = 700000; implied_telysium.category = "N/A"; implied_telysium.subcategory = "N/A"; - implied_telysium.name = "Test Exodus"; + implied_telysium.name = "Test Elysium"; implied_telysium.url = "https://www.indexchain.org"; - implied_telysium.data = "Test Exodus serve as the binding between Index, smart properties and contracts created on the Exodus Layer."; + implied_telysium.data = "Test Elysium serve as the binding between Index, smart properties and contracts created on the Elysium Layer."; init(); } diff --git a/src/elysium/test/create_payload_tests.cpp b/src/elysium/test/create_payload_tests.cpp index b942d91a7..9c2455cea 100644 --- a/src/elysium/test/create_payload_tests.cpp +++ b/src/elysium/test/create_payload_tests.cpp @@ -411,7 +411,7 @@ BOOST_AUTO_TEST_CASE(payload_freeze_tokens) std::vector vch = CreatePayload_FreezeTokens( static_cast(4), // property: SP #4 static_cast(1000), // amount to freeze (unused) - std::string("1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P")); // reference address + std::string("1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P")); // reference address BOOST_CHECK_EQUAL(HexStr(vch), "000000b90000000400000000000003e800946cb2e08075bcbaf157e47bcb67eb2b2339d242"); @@ -423,7 +423,7 @@ BOOST_AUTO_TEST_CASE(payload_unfreeze_tokens) std::vector vch = CreatePayload_UnfreezeTokens( static_cast(4), // property: SP #4 static_cast(1000), // amount to freeze (unused) - std::string("1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P")); // reference address + std::string("1ELYSIUMjGwvnjZUyKkxZ4UHEf77z6A5S4P")); // reference address BOOST_CHECK_EQUAL(HexStr(vch), "000000ba0000000400000000000003e800946cb2e08075bcbaf157e47bcb67eb2b2339d242"); diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index ca8456555..9839e37ed 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -375,7 +375,7 @@ class CTransaction { public: // Default transaction version. - // TODO: confirm Exodus works with transaction v2 and change it to 2 here + // TODO: confirm Elysium works with transaction v2 and change it to 2 here static const int32_t CURRENT_VERSION=1; // Changing the default transaction version requires a two step process: first diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index a5787e5dd..8f3c5d888 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -612,7 +612,7 @@ void BitcoinGUI::createToolBars() appNavigationBar->addAction(stakepageAction); #ifdef ENABLE_ELYSIUM - if (isExodusEnabled()) { + if (isElysiumEnabled()) { appNavigationBar->addAction(elyAssetsAction); appNavigationBar->addAction(toolboxAction); } diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 66c5508c9..ba3ebfcc0 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -59,7 +59,7 @@ QT_TRANSLATE_NOOP("index-core", "" QT_TRANSLATE_NOOP("index-core", "" "Disabled transaction index detected.\n" "\n" -"Exodus requires an enabled transaction index. To enable transaction " +"Elysium requires an enabled transaction index. To enable transaction " "indexing, please use the \"-txindex\" option as command line argument or add " "\"txindex=1\" to your client configuration file within your data directory.\n" "\n" @@ -162,7 +162,7 @@ QT_TRANSLATE_NOOP("index-core", "" QT_TRANSLATE_NOOP("index-core", "" "Please add txindex=1 to your configuration file manually.\n" "\n" -"Exodus will now shutdown."), +"Elysium will now shutdown."), QT_TRANSLATE_NOOP("index-core", "" "Please add txindex=1 to your configuration file manually.\n" "\n" @@ -305,7 +305,7 @@ QT_TRANSLATE_NOOP("index-core", "" "Whitelisted peers cannot be DoS banned and their transactions are always " "relayed, even if they are already in the mempool, useful e.g. for a gateway"), QT_TRANSLATE_NOOP("index-core", "" -"Would you like Exodus to attempt to update your configuration file " +"Would you like Elysium to attempt to update your configuration file " "accordingly?"), QT_TRANSLATE_NOOP("index-core", "" "You must specify a indexnodeprivkey in the configuration. Please see " @@ -318,7 +318,7 @@ QT_TRANSLATE_NOOP("index-core", "" QT_TRANSLATE_NOOP("index-core", "" "Your configuration file has been updated.\n" "\n" -"Exodus will now shutdown - please restart the client for your new " +"Elysium will now shutdown - please restart the client for your new " "configuration to take effect."), QT_TRANSLATE_NOOP("index-core", "" "it has to have at least two mint coins with at least 6 confirmation in order " @@ -484,7 +484,7 @@ QT_TRANSLATE_NOOP("index-core", "One of minted coin does not found in the chain" QT_TRANSLATE_NOOP("index-core", "One of the minted coin is invalid"), QT_TRANSLATE_NOOP("index-core", "Only connect to nodes in network (ipv4, ipv6 or onion)"), QT_TRANSLATE_NOOP("index-core", "Options:"), -QT_TRANSLATE_NOOP("index-core", "Parsing Exodus transactions..."), +QT_TRANSLATE_NOOP("index-core", "Parsing Elysium transactions..."), QT_TRANSLATE_NOOP("index-core", "Pass named instead of positional arguments (default: %s)"), QT_TRANSLATE_NOOP("index-core", "Password for JSON-RPC connections"), QT_TRANSLATE_NOOP("index-core", "Port: %d"), diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 07cf41743..fa9d24fb3 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -305,144 +305,144 @@ class CWalletDB : public CDB template bool ReadElysiumMintPoolV0(MintPool &mintPool) { - return Read(std::string("exodus_mint_pool"), mintPool); + return Read(std::string("elysium_mint_pool"), mintPool); } template bool WriteElysiumMintPoolV0(MintPool const &mintPool) { - return Write(std::string("exodus_mint_pool"), mintPool, true); + return Write(std::string("elysium_mint_pool"), mintPool, true); } bool HasElysiumMintPoolV0() { - return Exists(std::string("exodus_mint_pool")); + return Exists(std::string("elysium_mint_pool")); } template bool ReadElysiumMintIdV0(const Key& k, MintID &id) { - return Read(std::make_pair(std::string("exodus_mint_id"), k), id); + return Read(std::make_pair(std::string("elysium_mint_id"), k), id); } template bool WriteElysiumMintIdV0(const Key& k, const MintID &id) { - return Write(std::make_pair(std::string("exodus_mint_id"), k), id); + return Write(std::make_pair(std::string("elysium_mint_id"), k), id); } template bool HasElysiumMintIdV0(const Key& k) { - return Exists(std::make_pair(std::string("exodus_mint_id"), k)); + return Exists(std::make_pair(std::string("elysium_mint_id"), k)); } template bool EraseElysiumMintIdV0(const Key& k) { - return Erase(std::make_pair(std::string("exodus_mint_id"), k)); + return Erase(std::make_pair(std::string("elysium_mint_id"), k)); } template bool ReadElysiumMintV0(const K& k, V& v) { - return Read(std::make_pair(std::string("exodus_mint"), k), v); + return Read(std::make_pair(std::string("elysium_mint"), k), v); } template bool HasElysiumMintV0(const K& k) { - return Exists(std::make_pair(std::string("exodus_mint"), k)); + return Exists(std::make_pair(std::string("elysium_mint"), k)); } template bool WriteElysiumMintV0(const K &k, const V &v) { - return Write(std::make_pair(std::string("exodus_mint"), k), v, true); + return Write(std::make_pair(std::string("elysium_mint"), k), v, true); } template bool EraseElysiumMintV0(const K& k) { - return Erase(std::make_pair(std::string("exodus_mint"), k)); + return Erase(std::make_pair(std::string("elysium_mint"), k)); } template void ListElysiumMintsV0(InsertF insertF) { - ListEntries(string("exodus_mint"), insertF); + ListEntries(string("elysium_mint"), insertF); } // version 1 template bool ReadElysiumMintPoolV1(MintPool &mintPool) { - return Read(std::string("exodus_mint_pool_v1"), mintPool); + return Read(std::string("elysium_mint_pool_v1"), mintPool); } template bool WriteElysiumMintPoolV1(MintPool const &mintPool) { - return Write(std::string("exodus_mint_pool_v1"), mintPool, true); + return Write(std::string("elysium_mint_pool_v1"), mintPool, true); } bool HasElysiumMintPoolV1() { - return Exists(std::string("exodus_mint_pool_v1")); + return Exists(std::string("elysium_mint_pool_v1")); } template bool ReadElysiumMintIdV1(const Key& k, MintID &id) { - return Read(std::make_pair(std::string("exodus_mint_id_v1"), k), id); + return Read(std::make_pair(std::string("elysium_mint_id_v1"), k), id); } template bool WriteElysiumMintIdV1(const Key& k, const MintID &id) { - return Write(std::make_pair(std::string("exodus_mint_id_v1"), k), id); + return Write(std::make_pair(std::string("elysium_mint_id_v1"), k), id); } template bool HasElysiumMintIdV1(const Key& k) { - return Exists(std::make_pair(std::string("exodus_mint_id_v1"), k)); + return Exists(std::make_pair(std::string("elysium_mint_id_v1"), k)); } template bool EraseElysiumMintIdV1(const Key& k) { - return Erase(std::make_pair(std::string("exodus_mint_id_v1"), k)); + return Erase(std::make_pair(std::string("elysium_mint_id_v1"), k)); } template bool ReadElysiumMintV1(const K& k, V& v) { - return Read(std::make_pair(std::string("exodus_mint_v1"), k), v); + return Read(std::make_pair(std::string("elysium_mint_v1"), k), v); } template bool HasElysiumMintV1(const K& k) { - return Exists(std::make_pair(std::string("exodus_mint_v1"), k)); + return Exists(std::make_pair(std::string("elysium_mint_v1"), k)); } template bool WriteElysiumMintV1(const K &k, const V &v) { - return Write(std::make_pair(std::string("exodus_mint_v1"), k), v, true); + return Write(std::make_pair(std::string("elysium_mint_v1"), k), v, true); } template bool EraseElysiumMintV1(const K& k) { - return Erase(std::make_pair(std::string("exodus_mint_v1"), k)); + return Erase(std::make_pair(std::string("elysium_mint_v1"), k)); } template void ListElysiumMintsV1(InsertF insertF) { - ListEntries(string("exodus_mint_v1"), insertF); + ListEntries(string("elysium_mint_v1"), insertF); } #endif