Merge pull request #8 from Beldex-Coin/release-v3.1.2

Release v3.1.2 - Implementation of master node

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behaviour** 
+What is the expected behaviour if the steps above are followed:
+
+**Current Behaviour**
+What is the current behaviour if the steps to reproduce are followed:
+
+**Describe the bug**
+
+**Screenshots or Logs**
+If applicable, add screenshots or logs to help explain your problem.
+
+**Additional Information (please complete the following information):**
+ - Operating System: [e.g. Ubuntu 16.04, Windows 10]
+-  Local or Remote node
+ - Version of Beldex daemon, or most recent commit hash.

Dockerfile

@@ -197,7 +197,7 @@ RUN set -ex && \
 COPY --from=builder /src/build/release/bin /usr/local/bin/
 
 # Contains the blockchain
-VOLUME /root/.loki
+VOLUME /root/.beldex
 
 # Generate your wallet via accessing the container and run:
 # cd /wallet

README.i18n.md

@@ -1,9 +1,9 @@
 Beldex daemon internationalization
 ==================================
 
-The Beldex command line tools can be translated in various languages. If you wish to contribute and need help/support, contact the [Beldex Localization Workgroup on Taiga](https://taiga.getloki.org/project/erciccione-loki-localization/) or come chat on `#loki-translations` (Freenode/IRC, riot/matrix, MatterMost)
+The Beldex command line tools can be translated in various languages. If you wish to contribute and need help/support, contact the [Beldex Localization Workgroup on Taiga](https://taiga.getloki.org/project/erciccione-beldex-localization/) or come chat on `#beldex-translations` (Freenode/IRC, riot/matrix, MatterMost)
 
-In order to use the same translation workflow as the [Beldex GUI](https://github.com/Beldex-Coin/loki-gui), 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 [Beldex GUI](https://github.com/Beldex-Coin/beldex-gui), 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
 
@@ -19,7 +19,7 @@ To update ts files after changing source code:
 
 To add a new language, eg Spanish (ISO code es):
 
-    cp translations/loki.ts translations/beldex_es.ts
+    cp translations/beldex.ts translations/beldex_es.ts
 
 To edit translations for Spanish:
 
@@ -31,7 +31,7 @@ To build translations after modifying them:
 
 To test a translation:
 
-    LANG=es ./build/release/bin/loki-wallet-cli
+    LANG=es ./build/release/bin/beldex-wallet-cli
 
 To add new translatable strings in the source code:
 

contrib/gitian/README.md

@@ -83,7 +83,7 @@ Setup the required environment, you only need to do this once:
 ./gitian-build.py --setup beldex-user x.x.x
 ```
 
-Where `loki-user` is your Github name and `x.x.x` is the version tag you want to build.
+Where `beldex-user` is your Github name and `x.x.x` is the version tag you want to build.
 
 While gitian and this build script does provide a way for you to sign the build directly, it is recommended to sign in a seperate step. 
 This script is only there for convenience. Seperate steps for building can still be taken.
@@ -93,7 +93,7 @@ or pass the signed assert file back to your build machine.
 
 ```
 git clone git@github.com:Beldex-Coin/gitian.sigs.git
-git remote add beldex-user git@github.com:loki-user/gitian.sigs.git
+git remote add beldex-user git@github.com:beldex-user/gitian.sigs.git
 ```
 
 Build Binaries
@@ -109,11 +109,11 @@ If all went well, this produces a number of (uncommited) `.assert` files in the
 If you do detached, offline signing, you need to copy these uncommited changes to your host machine, where you can sign them. For example:
 
 ```
-export NAME=loki-user
+export NAME=beldex-user
 export VERSION=2.0.0
-gpg --output $VERSION-linux/$NAME/loki-linux-$VERSION-build.assert.sig --detach-sign $VERSION-linux/$NAME/loki-linux-$VERSION-build.assert
-gpg --output $VERSION-osx-unsigned/$NAME/loki-osx-$VERSION-build.assert.sig --detach-sign $VERSION-osx-unsigned/$NAME/loki-osx-$VERSION-build.assert
-gpg --output $VERSION-win-unsigned/$NAME/loki-win-$VERSION-build.assert.sig --detach-sign $VERSION-win-unsigned/$NAME/loki-win-$VERSION-build.assert
+gpg --output $VERSION-linux/$NAME/beldex-linux-$VERSION-build.assert.sig --detach-sign $VERSION-linux/$NAME/beldex-linux-$VERSION-build.assert
+gpg --output $VERSION-osx-unsigned/$NAME/beldex-osx-$VERSION-build.assert.sig --detach-sign $VERSION-osx-unsigned/$NAME/beldex-osx-$VERSION-build.assert
+gpg --output $VERSION-win-unsigned/$NAME/beldex-win-$VERSION-build.assert.sig --detach-sign $VERSION-win-unsigned/$NAME/beldex-win-$VERSION-build.assert
 ```
 
 Make a pull request (both the `.assert` and `.assert.sig` files) to the
@@ -126,8 +126,8 @@ git push --set-upstream $NAME 2.0.0
 ```
 
 ```bash
-    gpg --detach-sign ${VERSION}-linux/${SIGNER}/loki-linux-*-build.assert
-    gpg --detach-sign ${VERSION}-win-unsigned/${SIGNER}/loki-win-*-build.assert
-    gpg --detach-sign ${VERSION}-osx-unsigned/${SIGNER}/loki-osx-*-build.assert
+    gpg --detach-sign ${VERSION}-linux/${SIGNER}/beldex-linux-*-build.assert
+    gpg --detach-sign ${VERSION}-win-unsigned/${SIGNER}/beldex-win-*-build.assert
+    gpg --detach-sign ${VERSION}-osx-unsigned/${SIGNER}/beldex-osx-*-build.assert
 ```
 

contrib/gitian/gitian-build.py

@@ -26,8 +26,8 @@ def setup():
         subprocess.check_call(['git', 'clone', 'https://github.com/Beldex-Coin/gitian.sigs.git'])
     if not os.path.isdir('gitian-builder'):
         subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
-    if not os.path.isdir('loki'):
-        subprocess.check_call(['git', 'clone', 'https://github.com/Beldex-Coin/loki.git'])
+    if not os.path.isdir('beldex'):
+        subprocess.check_call(['git', 'clone', 'https://github.com/Beldex-Coin/beldex.git'])
     os.chdir('gitian-builder')
     subprocess.check_call(['git', 'checkout', '963322de8420c50502c4cc33d4d7c0d84437b576'])
     make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
@@ -45,7 +45,7 @@ def setup():
 def build():
     global args, workdir
 
-    os.makedirs('loki-binaries/' + args.version, exist_ok=True)
+    os.makedirs('beldex-binaries/' + args.version, exist_ok=True)
     print('\nBuilding Dependencies\n')
     os.chdir('gitian-builder')
     os.makedirs('inputs', exist_ok=True)
@@ -54,25 +54,25 @@ def build():
     subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
     subprocess.check_output(["echo 'a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 inputs/osslsigncode-Backports-to-1.7.1.patch' | sha256sum -c"], shell=True)
     subprocess.check_output(["echo 'f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9 inputs/osslsigncode-1.7.1.tar.gz' | sha256sum -c"], shell=True)
-    subprocess.check_call(['make', '-C', '../loki/contrib/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
+    subprocess.check_call(['make', '-C', '../beldex/contrib/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
 
     if args.linux:
         print('\nCompiling ' + args.version + ' Linux')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'loki='+args.commit, '--url', 'loki='+args.url, '../loki/contrib/gitian/gitian-linux.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../loki/contrib/gitian/gitian-linux.yml'])
-        subprocess.check_call('mv build/out/loki-*.tar.gz ../loki-binaries/'+args.version, shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'beldex='+args.commit, '--url', 'beldex='+args.url, '../beldex/contrib/gitian/gitian-linux.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../beldex/contrib/gitian/gitian-linux.yml'])
+        subprocess.check_call('mv build/out/beldex-*.tar.gz ../beldex-binaries/'+args.version, shell=True)
 
     if args.windows:
         print('\nCompiling ' + args.version + ' Windows')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'loki='+args.commit, '--url', 'loki='+args.url, '../loki/contrib/gitian/gitian-win.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win', '--destination', '../gitian.sigs/', '../loki/contrib/gitian/gitian-win.yml'])
-        subprocess.check_call('mv build/out/loki*.zip ../loki-binaries/'+args.version, shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'beldex='+args.commit, '--url', 'beldex='+args.url, '../beldex/contrib/gitian/gitian-win.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win', '--destination', '../gitian.sigs/', '../beldex/contrib/gitian/gitian-win.yml'])
+        subprocess.check_call('mv build/out/beldex*.zip ../beldex-binaries/'+args.version, shell=True)
 
     if args.macos:
         print('\nCompiling ' + args.version + ' MacOS')
-        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'loki='+args.commit, '--url', 'loki'+args.url, '../loki/contrib/gitian/gitian-osx.yml'])
-        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx', '--destination', '../gitian.sigs/', '../loki/contrib/gitian/gitian-osx.yml'])
-        subprocess.check_call('mv build/out/loki*.tar.gz ../loki-binaries/'+args.version, shell=True)
+        subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'beldex='+args.commit, '--url', 'beldex'+args.url, '../beldex/contrib/gitian/gitian-osx.yml'])
+        subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx', '--destination', '../gitian.sigs/', '../beldex/contrib/gitian/gitian-osx.yml'])
+        subprocess.check_call('mv build/out/beldex*.tar.gz ../beldex-binaries/'+args.version, shell=True)
 
     os.chdir(workdir)
 
@@ -90,11 +90,11 @@ def verify():
     os.chdir('gitian-builder')
 
     print('\nVerifying v'+args.version+' Linux\n')
-    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../loki/contrib/gitian/gitian-linux.yml'])
+    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../beldex/contrib/gitian/gitian-linux.yml'])
     print('\nVerifying v'+args.version+' Windows\n')
-    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win', '../loki/contrib/gitian/gitian-win.yml'])
+    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win', '../beldex/contrib/gitian/gitian-win.yml'])
     print('\nVerifying v'+args.version+' MacOS\n')
-    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx', '../loki/contrib/gitian/gitian-osx.yml'])
+    subprocess.check_call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx', '../beldex/contrib/gitian/gitian-osx.yml'])
     os.chdir(workdir)
 
 def main():
@@ -103,7 +103,7 @@ def main():
     parser = argparse.ArgumentParser(usage='%(prog)s [options] signer version')
     parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
     parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
-    parser.add_argument('-u', '--url', dest='url', default='https://github.com/Beldex-Coin/loki', help='Specify the URL of the repository. Default is %(default)s')
+    parser.add_argument('-u', '--url', dest='url', default='https://github.com/Beldex-Coin/beldex', help='Specify the URL of the repository. Default is %(default)s')
     parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
     parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
     parser.add_argument('-B', '--buildsign', action='store_true', dest='buildsign', help='Build both signed and unsigned binaries')
@@ -170,10 +170,10 @@ def main():
     if args.setup:
         setup()
 
-    os.chdir('loki')
+    os.chdir('beldex')
     if args.pull:
         subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
-        os.chdir('../gitian-builder/inputs/loki')
+        os.chdir('../gitian-builder/inputs/beldex')
         subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
         args.commit = subprocess.check_output(['git', 'show', '-s', '--format=%H', 'FETCH_HEAD'], universal_newlines=True).strip()
         args.version = 'pull-' + args.version

contrib/gitian/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "loki-linux-x64-1.0.4"
+name: "beldex-linux-x64-1.0.4"
 enable_cache: true
 suites:
 - "bionic"
@@ -43,7 +43,7 @@ packages:
 - "libprotobuf-dev"
 - "python3-zmq"
 remotes:
-- "url": "https://github.com/Beldex-Coin/loki.git"
+- "url": "https://github.com/Beldex-Coin/beldex.git"
   "dir": "beldex"
 files: []
 script: |
@@ -154,7 +154,7 @@ script: |
     mkdir build && cd build
     cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON
     make
-    DISTNAME=loki-${i}
+    DISTNAME=beldex-${i}
     mv bin ${DISTNAME}
     find ${DISTNAME}/ | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}.tar.gz
     cd ..

contrib/gitian/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "loki-osx-x64-1.0.4"
+name: "beldex-osx-x64-1.0.4"
 enable_cache: true
 suites:
 - "bionic"
@@ -28,7 +28,7 @@ packages:
 - "python-setuptools"
 - "fonts-tuffy"
 remotes:
-- "url": "https://github.com/Beldex-Coin/loki.git"
+- "url": "https://github.com/Beldex-Coin/beldex.git"
   "dir": "beldex"
 files:
 - "MacOSX10.11.sdk.tar.gz"
@@ -105,7 +105,7 @@ script: |
     mkdir build && cd build
     cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
     make
-    DISTNAME=loki-${i}
+    DISTNAME=beldex-${i}
     mv bin ${DISTNAME}
     find ${DISTNAME}/ | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}.tar.gz
     cd ..

contrib/gitian/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "loki-windows-x64-1.0.4"
+name: "beldex-windows-x64-1.0.4"
 enable_cache: true
 suites:
 - "bionic"
@@ -23,7 +23,7 @@ packages:
 - "rename"
 - "cmake"
 remotes:
-- "url": "https://github.com/Beldex-Coin/loki.git"
+- "url": "https://github.com/Beldex-Coin/beldex.git"
   "dir": "beldex"
 files: []
 script: |
@@ -126,7 +126,7 @@ script: |
     mkdir build && cd build
     cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake
     make
-    DISTNAME=loki-${i}
+    DISTNAME=beldex-${i}
     mv bin ${DISTNAME}
     find ${DISTNAME}/ | sort | zip -X@ ${OUTDIR}/${DISTNAME}.zip
     cd .. && rm -rf build

src/blockchain_utilities/README.md

@@ -22,7 +22,7 @@ This loads the existing blockchain and exports it to `$BELDEX_DATA_DIR/export/bl
 `$ beldex-blockchain-import`
 
 This imports blocks from `$BELDEX_DATA_DIR/export/blockchain.raw` (exported using the
-`loki-blockchain-export` tool as described above) into the current database.
+`beldex-blockchain-export` tool as described above) into the current database.
 
 Defaults: `--batch on`, `--batch size 20000`, `--verify on`
 
@@ -31,7 +31,7 @@ Batch size refers to number of blocks and can be adjusted for performance based
 Verification should only be turned off if importing from a trusted blockchain.
 
 If you encounter an error like "resizing not supported in batch mode", you can just re-run
-the `loki-blockchain-import` command again, and it will restart from where it left off.
+the `beldex-blockchain-import` command again, and it will restart from where it left off.
 
 ```bash
 ## use default settings to import blockchain.raw into database

src/blockchain_utilities/blockchain_ancestry.cpp

@@ -404,7 +404,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-ancestry.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-ancestry.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_blackball.cpp

@@ -139,7 +139,7 @@ static bool parse_db_sync_mode(std::string db_sync_mode)
 static std::string get_default_db_path()
 {
   boost::filesystem::path dir = tools::get_default_data_dir();
-  // remove .loki, replace with .shared-ringdb
+  // remove .beldex, replace with .shared-ringdb
   dir = dir.remove_filename();
   dir /= ".shared-ringdb";
   return dir.string();
@@ -1135,7 +1135,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-mark-spent-outputs.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-mark-spent-outputs.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_depth.cpp

@@ -101,7 +101,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-depth.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-depth.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_export.cpp

@@ -102,7 +102,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-export.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-export.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_import.cpp

@@ -683,7 +683,7 @@ int main(int argc, char* argv[])
   m_config_folder = command_line::get_arg(vm, cryptonote::arg_data_dir);
   db_arg_str = command_line::get_arg(vm, arg_database);
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-import.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-import.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_prune.cpp

@@ -496,7 +496,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-prune.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-prune.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_prune_known_spent_data.cpp

@@ -155,7 +155,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-prune-known-spent-data.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-prune-known-spent-data.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else

src/blockchain_utilities/blockchain_stats.cpp

@@ -111,7 +111,7 @@ int main(int argc, char* argv[])
     return 1;
   }
 
-  mlog_configure(mlog_get_default_log_path("loki-blockchain-stats.log"), true);
+  mlog_configure(mlog_get_default_log_path("beldex-blockchain-stats.log"), true);
   if (!command_line::is_arg_defaulted(vm, arg_log_level))
     mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
   else