Merge branch 'pirate_da_dev'

Author: CryptoForge

.travis.yml

@@ -20,8 +20,8 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rm '/usr/local/include/c++'; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc@6; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --overwrite gcc@6; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc@8; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link --overwrite gcc@8; fi
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./zcutil/build.sh -j 5; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar cvfz komodo_linux_$TRAVIS_BRANCH.tar.gz src/komodod src/komodo-cli; fi 

Brewfile

@@ -9,7 +9,7 @@ brew "automake"
 brew "binutils"
 brew "cmake"
 brew "coreutils"
-brew "gcc@6"
+brew "gcc@8"
 brew "leveldb"
 brew "nanomsg"
 brew "protobuf"

PirateOcean.pro.user

@@ -16,7 +16,7 @@ brew bundle
 or 
 
 ```shell
-brew tap discoteq/discoteq; brew install flock autoconf autogen automake gcc@6 binutils protobuf coreutils wget
+brew tap discoteq/discoteq; brew install flock autoconf autogen automake gcc@8 binutils protobuf coreutils wget
 ```
 
 Get all that installed, then run:

README-mac.md

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
-define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
@@ -779,7 +779,7 @@ fi
 # platforms, so we use older autoconf detection mechanisms:
 if test x$TARGET_OS = xdarwin; then
 AC_CHECK_HEADER([gmp.h],,AC_MSG_ERROR(libgmp headers missing))
-AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
+#AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
 
 AC_CHECK_HEADER([gmpxx.h],,AC_MSG_ERROR(libgmpxx headers missing))
 AC_CHECK_LIB([gmpxx],[main],GMPXX_LIBS=-lgmpxx, [AC_MSG_ERROR(libgmpxx missing)])

configure.ac

@@ -91,6 +91,7 @@ $(1)_download_path_fixed=$(subst :,\:,$$($(1)_download_path))
 
 
 #default commands
+# The default behavior for tar will try to set ownership when running as uid 0 and may not succeed, --no-same-owner disables this behavior
 $(1)_fetch_cmds ?= $(call fetch_file,$(1),$(subst \:,:,$$($(1)_download_path_fixed)),$$($(1)_download_file),$($(1)_file_name),$($(1)_sha256_hash))
 $(1)_extract_cmds ?= mkdir -p $$($(1)_extract_dir) && echo "$$($(1)_sha256_hash)  $$($(1)_source)" > $$($(1)_extract_dir)/.$$($(1)_file_name).hash &&  $(build_SHA256SUM) -c $$($(1)_extract_dir)/.$$($(1)_file_name).hash && tar --no-same-owner --strip-components=1 -xf $$($(1)_source)
 $(1)_preprocess_cmds ?=

depends/funcs.mk

@@ -1,8 +1,8 @@
 package=bdb
-$(package)_version=6.2.23
+$(package)_version=6.2.32
 $(package)_download_path=https://download.oracle.com/berkeley-db
 $(package)_file_name=db-$($(package)_version).tar.gz
-$(package)_sha256_hash=47612c8991aa9ac2f6be721267c8d3cdccf5ac83105df8e50809daea24e95dc7
+$(package)_sha256_hash=a9c5e2b004a5777aa03510cfe5cd766a4a3b777713406b02809c17c8e0e7a8fb
 $(package)_build_subdir=build_unix
 
 define $(package)_set_vars

depends/packages/bdb.mk

@@ -1,6 +1,6 @@
 PACKAGE=qt
 $(package)_version=5.9.8
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
+$(package)_download_path=http://mirrors.ocf.berkeley.edu/qt/archive/qt/5.9/$($(package)_version)/submodules
 $(package)_suffix=opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=9b9dec1f67df1f94bce2955c5604de992d529dde72050239154c56352da0907d

depends/packages/qt.mk

@@ -410,6 +410,12 @@ KOMODO_QT_CPP += \
 
 RES_IMAGES = \
   qt/res/backgrounds/pirate.png \
+  qt/res/backgrounds/piratemap.png \
+  qt/res/backgrounds/armada.png \
+  qt/res/backgrounds/night.png \
+  qt/res/backgrounds/ghostship.png \
+  qt/res/backgrounds/treasure.png \
+  qt/res/backgrounds/treasuremap.png \
   qt/res/backgrounds/splash.png
 
 RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)

src/Makefile.qt.include

@@ -0,0 +1,267 @@
+{
+    "REVS": {
+      "ac_supply": "1300000"
+    }
+  ,
+  
+    "SUPERNET": {
+      "ac_supply": "816061"
+    }
+  ,
+  
+    "DEX": {
+      "ac_supply": "999999"
+    }
+  ,
+  
+    "PANGEA": {
+      "ac_supply": "999999"
+    }
+  
+  ,
+    "JUMBLR": {
+      "ac_supply": "999999"
+    }
+  ,
+  
+    "BET": {
+      "ac_supply": "999999"
+    }
+  ,
+  
+    "CRYPTO": {
+      "ac_supply": "999999"
+    }
+  ,
+  
+    "HODL": {
+      "ac_supply": "9999999"
+    }
+  ,
+  
+    "MSHARK": {
+      "ac_supply": "1400000"
+    }
+  ,
+  
+    "BOTS": {
+      "ac_supply": "999999"
+    }
+  ,
+  
+    "MGW": {
+      "ac_supply": "999999"
+    }
+  ,
+    "COQUICASH": {
+      "ac_supply": "72000000",
+      "ac_reward": "7200000000",
+      "ac_staked": "50",
+      "ac_halving": "420000",
+      "ac_cc": "2",
+      "ac_ccenable": "227,235,236,241",
+      "addnode": [
+        "78.47.108.168"
+      ]
+    }
+   ,
+    
+    "WLC": {
+      "ac_supply": "210000000"
+    }
+  ,
+  
+    "KV": {
+      "ac_supply": "1000000"
+    }
+  ,
+  
+    "MESH": {
+      "ac_supply": "1000007"
+    }
+  ,
+  
+    "AXO": {
+      "ac_supply": "200000000",
+      "ac_ccactivate": "130000"
+    }
+  ,
+  
+    "ETOMIC": {
+      "ac_supply": "100000000"
+    }
+  ,
+  
+    "BTCH": {
+      "ac_supply": "20998641"
+    }
+  ,
+  
+    "NINJA": {
+      "ac_supply": "100000000"
+    }
+  ,
+  
+    "OOT": {
+      "ac_supply": "216000000",
+      "ac_sapling": "5000000"
+    }
+  ,
+ 
+    "ZILLA": {
+      "ac_supply": "11000000",
+      "ac_sapling": "5000000",
+      "addnode": [
+        "51.68.215.104"
+      ]
+    }
+  ,
+  
+    "RFOX": {
+      "ac_supply": "1000000000",
+      "ac_reward": "100000000"
+    }
+  ,
+  
+    "SEC": {
+      "ac_supply": "1000000000",
+      "ac_cc": "333"
+    }
+  ,
+  
+    "CCL": {
+      "ac_supply": "200000000",
+      "ac_end": "1",
+      "ac_cc": "2",
+      "addressindex": "1",
+      "spentindex": "1",
+      "addnode": [
+        "142.93.136.89",
+        "195.201.22.89"
+      ]
+    }
+  ,
+  
+    "PIRATE": {
+      "ac_supply": "0",
+      "ac_reward": "25600000000",
+      "ac_halving": "77777",
+      "ac_private": "1",
+      "addnode": [
+        "136.243.102.225"
+      ]
+    }
+  ,
+  
+    "PGT": {
+      "ac_supply": "10000000",
+      "ac_end": "1",
+      "addnode": [
+        "190.114.254.104"
+      ]
+    }
+  ,
+ 
+    "KSB": {
+      "ac_supply": "1000000000",
+      "ac_end": "1",
+      "ac_public": "1",
+      "addnode": [
+        "37.187.225.231"
+      ]
+    }
+  ,
+  
+    "OUR": {
+      "ac_reward": "1478310502",
+      "ac_halving": "525600",
+      "ac_cc": "42",
+      "ac_supply": "100000000",
+      "ac_perc": "77700",
+      "ac_staked": "93",
+      "ac_pubkey": "02652a3f3e00b3a1875a918314f0bac838d6dd189a346fa623f5efe9541ac0b98c",
+      "ac_public": "1",
+      "addnode": [
+        "51.255.195.65",
+        "217.182.129.38",
+        "37.187.225.231"
+      ]
+    }
+  ,
+  
+    "ILN": {
+      "ac_supply": "10000000000",
+      "ac_cc": "2",
+      "addnode": ["51.75.122.83"]
+    }
+  ,
+  
+    "RICK": {
+      "ac_supply": "90000000000",
+      "ac_reward": "100000000",
+      "ac_cc": "3",
+      "addnode": ["138.201.136.145"]
+    }
+  ,
+  
+    "MORTY": {
+      "ac_supply": "90000000000",
+      "ac_reward": "100000000",
+      "ac_cc": "3",
+      "addnode": ["138.201.136.145"]
+    }
+  ,
+  
+    "KOIN": {
+      "ac_supply": "125000000",
+      "addnode": ["3.0.32.10"]
+    }
+  ,
+  
+    "ZEXO": {
+      "ac_reward": "1478310502",
+      "ac_halving": "525600",
+      "ac_cc": "42",
+      "ac_ccenable": "236",
+      "ac_supply": "100000000",
+      "ac_perc": "77700",
+      "ac_staked": "93",
+      "ac_pubkey": "02713bd85e054db923694b6b7a85306264edf4d6bd6d331814f2b40af444b3ebbc",
+      "ac_public": "1",
+      "addnode": [
+        "195.201.20.230",
+        "80.240.17.222"
+      ]
+    }
+  ,
+  
+    "K64": {
+      "ac_reward": "0",
+      "ac_supply": "64000777",
+      "ac_staked": "10",
+      "addnode": ["18.197.20.21"]
+    }
+  ,
+  
+    "HUSH3": {
+      "ac_sapling": "1",
+      "ac_founders": "1",
+      "ac_reward": "0,1125000000,562500000",
+      "ac_end": "128,340000,5422111",
+      "ac_blocktime": "150",
+      "ac_supply": "6178674",
+      "ac_halving": "129,340000,840000",
+      "ac_cc": "2",
+      "ac_cclib": "hush3",
+      "ac_ccenable": "228,234,235,236,241",
+      "ac_perc": "11111111",
+      "ac_eras": "3",
+      "ac_script": "76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac",
+      "clientname": "GoldenSandtrout",
+      "addnode": [
+        "188.165.212.101",
+        "136.243.227.142",
+        "5.9.224.250"
+      ]
+    }
+}

src/ac.json

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=STBL $1 $2 $3 $4 $5 $6