Merge version 0.3.0.0 from dev

Merge version 0.3.0.0 from dev

configure.ac

@@ -10,9 +10,9 @@ esac
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 5)
-define(_CLIENT_VERSION_BUILD, 18) # version 99 here indicates an unreleased version
+define(_CLIENT_VERSION_MINOR, 3)
+define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_BUILD, 0) # version 99 here indicates an unreleased version
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

contrib/gitian-descriptors/gitian-arm.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-linux-0.2.5.18"
+name: "eccoin-linux-0.3.0.0"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-linux-0.2.5.18"
+name: "eccoin-linux-0.3.0.0"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-osx-0.2.5.18"
+name: "eccoin-osx-0.3.0.0"
 enable_cache: true
 suites:
 - "bionic"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "eccoin-win-0.2.5.18"
+name: "eccoin-win-0.3.0.0"
 enable_cache: true
 suites:
 - "bionic"

qa/pull-tester/rpc-tests.py

@@ -178,11 +178,7 @@ def option_passed(option_without_dashes):
 
 #Tests
 testScripts = [ RpcTest(t) for t in [
- #'rawtransactions', ???
- 'multi_rpc',
- # 'fundrawtransaction', ???
- 'reindex',
- Disabled('getchaintips', "issue with syncpoints getting stuck"),
+ #'getchaintips', #TIMEOUT
  'httpbasics',
  'keypool',
  'listtransactions',
@@ -191,14 +187,21 @@ def option_passed(option_without_dashes):
  #'mempool_resurrect_test',
  #'mempool_spendcoinbase',
  'mintingtest',
+ 'multi_rpc',
  'nodehandling',
+ 'notify',
  'proxy_test',
  'receivedby',
+ 'reindex',
+ #'sendheaders', #rpc missing
  'txpropagate',
  'verifydb',
  'wallet',
- Disabled('walletbackup', "TIMEOUT"), # issue with restarting nodes mid test
+ 'walletbackup',
+ #'wallet-dump',
  'zapwallettxes',
+ #'rawtransactions', ???
+ #'fundrawtransaction', ???
  #
  Disabled('mempool_limit', "FAILS"),
  Disabled('mempool_reorg', "FAILS"),
@@ -211,20 +214,16 @@ def option_passed(option_without_dashes):
  Disabled('invalidtxrequest', "FAILS"),
  Disabled('merkle_blocks', "FAILS"),
  Disabled('miningtest', "FAILS"),
- Disabled('sendheaders', "FAILS"),
  Disabled('signrawtransactions', "FAILS"),
  #
- Disabled('wallet-dump', "TIMEOUT"),
  Disabled('txn_doublespend --mineblock', "TIMEOUT"),
  Disabled('txn_clone', "TIMEOUT"),
- Disabled('notify', "TIMEOUT"),
  Disabled('validateblocktemplate', "TIMEOUT"),
  Disabled('blockchain', "TIMEOUT"),
  #
  Disabled('prioritise_transaction', "TODO"),
  Disabled('invalidblockrequest', "TODO"),
  Disabled('p2p-fullblocktest', "TODO"),
- Disabled('wallet-hd', "TODO"),
 
 ] ]
 

qa/rpc-tests/aodv.py

@@ -78,6 +78,31 @@ def run_test (self):
  time.sleep(1)
  assert_equal(self.nodes[0].haveroute(key5), True)
 
+ stop_nodes(self.nodes)
+ wait_bitcoinds()
+
+ self.nodes = start_nodes(6, self.options.tmpdir)
+ connect_nodes_bi(self.nodes,0,1)
+ connect_nodes_bi(self.nodes,1,2)
+ connect_nodes_bi(self.nodes,2,3)
+ connect_nodes_bi(self.nodes,3,4)
+ connect_nodes_bi(self.nodes,4,5)
+ self.is_network_split=False
+ self.sync_all()
+
+ for x in range(0, 1):
+ self.nodes[0].generate(1);
+ self.sync_blocks()
+ self.sync_all()
+
+ assert_equal(self.nodes[0].getroutingpubkey(), key0)
+ assert_equal(self.nodes[1].getroutingpubkey(), key1)
+ assert_equal(self.nodes[2].getroutingpubkey(), key2)
+ assert_equal(self.nodes[3].getroutingpubkey(), key3)
+ assert_equal(self.nodes[4].getroutingpubkey(), key4)
+ assert_equal(self.nodes[5].getroutingpubkey(), key5)
+
+
 
 if __name__ == '__main__':
  AodvTest().main(bitcoinConfDict={"beta": 1})