Netbox.Wallet v3.4.0

.travis.yml

@@ -31,8 +31,8 @@ language: minimal
 cache:
  ccache: true
  directories:
- - depends/built
- - depends/sdk-sources
+ - $TRAVIS_BUILD_DIR/depends/built
+ - $TRAVIS_BUILD_DIR/depends/sdk-sources
  - $HOME/.ccache
 stages:
  - lint
@@ -64,7 +64,7 @@ script:
  - export CONTINUE=1
  - if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi # Likely the depends build took very long
  - if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
- - if [ $SECONDS -gt 2000 ]; then export CONTINUE=0; fi # Likely the build took very long; The tests take about 1000s, so we should abort if we have less than 50*60-1000=2000s left
+ - if [ $SECONDS -gt 1500 ]; then export CONTINUE=0; fi # Likely the build took very long; The tests take about 1000s, so we should abort if we have less than 50*60-1000=2000s left
  - if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
 after_script:
  - echo $TRAVIS_COMMIT_RANGE

.travis/test_06_script_b.sh

@@ -16,6 +16,8 @@ fi
 
 if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
  BEGIN_FOLD functional-tests
- DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet
+ DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 ${TEST_RUNNER_EXTRA}
  END_FOLD
 fi
+
+cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1)

CMakeLists.txt

@@ -312,7 +312,6 @@ set(SERVER_SOURCES
  ./src/rpc/blockchain.cpp
  ./src/rpc/dappstore.cpp
  ./src/rpc/masternode.cpp
- ./src/rpc/budget.cpp
  ./src/rpc/mining.cpp
  ./src/rpc/misc.cpp
  ./src/rpc/net.cpp
@@ -350,7 +349,6 @@ set(WALLET_SOURCES
  ./src/crypter.cpp
  ./src/swifttx.cpp
  ./src/masternode.cpp
- ./src/masternode-budget.cpp
  ./src/masternode-payments.cpp
  ./src/masternode-sync.cpp
  ./src/masternodeconfig.cpp
@@ -362,7 +360,6 @@ set(WALLET_SOURCES
  ./src/wallet/wallet_ismine.cpp
  ./src/wallet/walletdb.cpp
  ./src/stakeinput.cpp
- ./src/genwit.cpp
  )
 add_library(WALLET_A STATIC ${BitcoinHeaders} ${WALLET_SOURCES})
 

COPYING

@@ -1,7 +1,7 @@
 Copyright (c) 2009-2015 Bitcoin Developers
 Copyright (c) 2014-2015 Dash Developers
 Copyright (c) 2015-2019 PIVX Developers
-Copyright (c) 2018-2019 Netbox.Global
+Copyright (c) 2018-2020 Netbox.Global
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

configure.ac

@@ -1,11 +1,11 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 3)
+define(_CLIENT_VERSION_MINOR, 4)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 10)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2019)
+define(_COPYRIGHT_YEAR, 2020)
 AC_INIT([Netbox.Global],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[netbox.global],[nbx])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/nbx-config.h])
@@ -1100,8 +1100,8 @@ CXXFLAGS="${save_CXXFLAGS}"
 AC_CHECK_LIB([crypto],[RAND_egd],[],[
  AC_ARG_WITH([unsupported-ssl],
  [AS_HELP_STRING([--with-unsupported-ssl],[Build with system SSL (default is no; DANGEROUS; NOT SUPPORTED; You should use OpenSSL 1.0)])],
- [AC_MSG_WARN([Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility!])],
- [AC_MSG_ERROR([Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility!])]
+ [AC_MSG_WARN([Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility! Use '--with-unsupported-ssl' if you don't care])],
+ [AC_MSG_ERROR([Detected unsupported SSL version: This is NOT supported, and may break consensus compatibility! Use '--with-unsupported-ssl' if you don't care])]
  )
 ])
 

contrib/debian/control

@@ -38,7 +38,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: peer-to-peer network based digital currency - daemon
  Netbox.Wallet is a free open source peer-to-peer electronic cash system that
  is completely decentralized, without the need for a central server or
- trusted parties. Users hold the crypto keys to their own money and
+ trusted parties. Users hold the crypto keys to their own coins and
  transact directly with each other, with the help of a P2P network to
  check for double-spending.
  .
@@ -54,7 +54,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: peer-to-peer network based digital currency - Qt GUI
  Netbox.Wallet is a free open source peer-to-peer electronic cash system that
  is completely decentralized, without the need for a central server or
- trusted parties. Users hold the crypto keys to their own money and
+ trusted parties. Users hold the crypto keys to their own coins and
  transact directly with each other, with the help of a P2P network to
  check for double-spending.
  .

contrib/devtools/check-doc.py

@@ -22,7 +22,7 @@
 REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
 REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider'])
+SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-checklevel', '-liquidityprovider'])
 
 def main():
  used = check_output(CMD_GREP_ARGS, shell=True, universal_newlines=True)

contrib/devtools/copyright_header.py

@@ -17,7 +17,7 @@
 
 EXCLUDE = [
  # auto generated:
- 'src/qt/pivxstrings.cpp',
+ 'src/qt/nbxstrings.cpp',
  'src/chainparamsseeds.h',
  # other external copyrights:
  'src/tinyformat.h',

contrib/devtools/github-merge.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2017 Bitcoin Core Developers
+# Copyright (c) 2016-2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -32,11 +32,15 @@
 # OS specific configuration for terminal attributes
 ATTR_RESET = ''
 ATTR_PR = ''
-COMMIT_FORMAT = '%h %s (%an)%d'
+ATTR_NAME = ''
+ATTR_WARN = ''
+COMMIT_FORMAT = '%H %s (%an)%d'
 if os.name == 'posix': # if posix, assume we can use basic terminal escapes
  ATTR_RESET = '\033[0m'
  ATTR_PR = '\033[1;36m'
- COMMIT_FORMAT = '%C(bold blue)%h%Creset %s %C(cyan)(%an)%Creset%C(green)%d%Creset'
+ ATTR_NAME = '\033[0;36m'
+ ATTR_WARN = '\033[1;31m'
+ COMMIT_FORMAT = '%C(bold blue)%H%Creset %s %C(cyan)(%an)%Creset%C(green)%d%Creset'
 
 def git_config_get(option, default=None):
  '''
@@ -164,18 +168,36 @@ def tree_sha512sum(commit='HEAD'):
  return overall.hexdigest()
 
 def get_acks_from_comments(head_commit, comments):
- assert len(head_commit) == 6
- ack_str ='\n\nACKs for commit {}:\n'.format(head_commit)
+ # Look for abbreviated commit id, because not everyone wants to type/paste
+ # the whole thing and the chance of collisions within a PR is small enough
+ head_abbrev = head_commit[0:6]
+ acks = []
  for c in comments:
- review = [l for l in c['body'].split('\r\n') if 'ACK' in l and head_commit in l]
+ review = [l for l in c['body'].split('\r\n') if 'ACK' in l and head_abbrev in l]
  if review:
- ack_str += ' {}:\n'.format(c['user']['login'])
- ack_str += ' {}\n'.format(review[0])
+ acks.append((c['user']['login'], review[0]))
+ return acks
+
+def make_acks_message(head_commit, acks):
+ if acks:
+ ack_str ='\n\nACKs for top commit:\n'.format(head_commit)
+ for name, msg in acks:
+ ack_str += ' {}:\n'.format(name)
+ ack_str += ' {}\n'.format(msg)
+ else:
+ ack_str ='\n\nTop commit has no ACKs.\n'
  return ack_str
 
-def print_merge_details(pull, title, branch, base_branch, head_branch):
+def print_merge_details(pull, title, branch, base_branch, head_branch, acks):
  print('%s#%s%s %s %sinto %s%s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title,ATTR_RESET+ATTR_PR,branch,ATTR_RESET))
  subprocess.check_call([GIT,'log','--graph','--topo-order','--pretty=format:'+COMMIT_FORMAT,base_branch+'..'+head_branch])
+ if acks is not None:
+ if acks:
+ print('{}ACKs:{}'.format(ATTR_PR, ATTR_RESET))
+ for (name, message) in acks:
+ print('* {} {}({}){}'.format(message, ATTR_NAME, name, ATTR_RESET))
+ else:
+ print('{}Top commit has no ACKs!{}'.format(ATTR_WARN, ATTR_RESET))
 
 def parse_arguments():
  epilog = '''
@@ -225,9 +247,6 @@ def main():
  info = retrieve_pr_info(repo,pull,ghtoken)
  if info is None:
  sys.exit(1)
- comments = retrieve_pr_comments(repo,pull,ghtoken) + retrieve_pr_reviews(repo,pull,ghtoken)
- if comments is None:
- sys.exit(1)
  title = info['title'].strip()
  body = info['body'].strip()
  # precedence order for destination branch argument:
@@ -257,6 +276,8 @@ def main():
  sys.exit(3)
  try:
  subprocess.check_call([GIT,'log','-q','-1','refs/heads/'+head_branch], stdout=devnull, stderr=stdout)
+ head_commit = subprocess.check_output([GIT,'log','-1','--pretty=format:%H',head_branch]).decode('utf-8')
+ assert len(head_commit) == 40
  except subprocess.CalledProcessError:
  print("ERROR: Cannot find head of pull request #%s on %s." % (pull,host_repo), file=stderr)
  sys.exit(3)
@@ -279,9 +300,8 @@ def main():
  else:
  firstline = 'Merge #%s' % (pull,)
  message = firstline + '\n\n'
- message += subprocess.check_output([GIT,'log','--no-merges','--topo-order','--pretty=format:%h %s (%an)',base_branch+'..'+head_branch]).decode('utf-8')
+ message += subprocess.check_output([GIT,'log','--no-merges','--topo-order','--pretty=format:%H %s (%an)',base_branch+'..'+head_branch]).decode('utf-8')
  message += '\n\nPull request description:\n\n ' + body.replace('\n', '\n ') + '\n'
- message += get_acks_from_comments(head_commit=subprocess.check_output([GIT,'log','-1','--pretty=format:%H',head_branch]).decode('utf-8')[:6], comments=comments)
  try:
  subprocess.check_call([GIT,'merge','-q','--commit','--no-edit','--no-ff','--no-gpg-sign','-m',message.encode('utf-8'),head_branch])
  except subprocess.CalledProcessError:
@@ -299,20 +319,14 @@ def main():
  if len(symlink_files) > 0:
  sys.exit(4)
 
- # Put tree SHA512 into the message
+ # Compute SHA512 of git tree (to be able to detect changes before sign-off)
  try:
  first_sha512 = tree_sha512sum()
- message += '\n\nTree-SHA512: ' + first_sha512
  except subprocess.CalledProcessError:
  print("ERROR: Unable to compute tree hash")
  sys.exit(4)
- try:
- subprocess.check_call([GIT,'commit','--amend','--no-gpg-sign','-m',message.encode('utf-8')])
- except subprocess.CalledProcessError:
- print("ERROR: Cannot update message.", file=stderr)
- sys.exit(4)
 
- print_merge_details(pull, title, branch, base_branch, head_branch)
+ print_merge_details(pull, title, branch, base_branch, head_branch, None)
  print()
 
  # Run test command if configured.
@@ -345,8 +359,24 @@ def main():
  print("ERROR: Tree hash changed unexpectedly",file=stderr)
  sys.exit(8)
 
+ # Retrieve PR comments and ACKs and add to commit message, store ACKs to print them with commit
+ # description
+ comments = retrieve_pr_comments(repo,pull,ghtoken) + retrieve_pr_reviews(repo,pull,ghtoken)
+ if comments is None:
+ print("ERROR: Could not fetch PR comments and reviews",file=stderr)
+ sys.exit(1)
+ acks = get_acks_from_comments(head_commit=head_commit, comments=comments)
+ message += make_acks_message(head_commit=head_commit, acks=acks)
+ # end message with SHA512 tree hash, then update message
+ message += '\n\nTree-SHA512: ' + first_sha512
+ try:
+ subprocess.check_call([GIT,'commit','--amend','--no-gpg-sign','-m',message.encode('utf-8')])
+ except subprocess.CalledProcessError:
+ print("ERROR: Cannot update message.", file=stderr)
+ sys.exit(4)
+
  # Sign the merge commit.
- print_merge_details(pull, title, branch, base_branch, head_branch)
+ print_merge_details(pull, title, branch, base_branch, head_branch, acks)
  while True:
  reply = ask_prompt("Type 's' to sign off on the above merge, or 'x' to reject and exit.").lower()
  if reply == 's':
@@ -381,4 +411,3 @@ def main():
 
 if __name__ == '__main__':
  main()
-