From f60ba7d7cbf4a657058fe62ca7bc1128676bdf2b Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sat, 24 Nov 2018 08:16:17 +0100 Subject: [PATCH] Basic test for ac_private chains --- qa/rpc-tests/ac_private.py | 92 ++++++++++++++++++++++++++++++++++++++ src/main.cpp | 5 +++ 2 files changed, 97 insertions(+) create mode 100755 qa/rpc-tests/ac_private.py diff --git a/qa/rpc-tests/ac_private.py b/qa/rpc-tests/ac_private.py new file mode 100755 index 000000000..fafc4b4cd --- /dev/null +++ b/qa/rpc-tests/ac_private.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python2 +# Copyright (c) 2018 SuperNET developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +from test_framework.test_framework import BitcoinTestFramework +from test_framework.authproxy import JSONRPCException +from test_framework.util import assert_equal, assert_greater_than, \ + initialize_chain_clean, initialize_chain, start_nodes, start_node, connect_nodes_bi, \ + stop_nodes, sync_blocks, sync_mempools, wait_bitcoinds, rpc_port, assert_raises + +import time +from decimal import Decimal +from random import choice +from string import ascii_uppercase + +def assert_success(result): + assert_equal(result['result'], 'success') + +def assert_error(result): + assert_equal(result['result'], 'error') + +def generate_random_string(length): + random_string = ''.join(choice(ascii_uppercase) for i in range(length)) + return random_string + + +class AssetChainPrivateTest (BitcoinTestFramework): + + def setup_chain(self): + print("Initializing VerusHash test directory "+self.options.tmpdir) + self.num_nodes = 1 + initialize_chain_clean(self.options.tmpdir, self.num_nodes) + + def setup_network(self, split = False): + print("Setting up network...") + # These nodes simulate the ARRR asset chain parameters + self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, + extra_args=[[ + # always give -ac_name as first extra_arg and port as third + '-ac_name=REGTEST', + '-conf='+self.options.tmpdir+'/node0/REGTEST.conf', + '-port=64367', + '-rpcport=64368', + '-regtest', + '-addressindex=1', + '-spentindex=1', + '-ac_supply=0', + '-ac_reward=25600000000', + '-ac_private=1', + '-whitelist=127.0.0.1', + '-debug', + '--daemon', + '-rpcuser=rt', + '-rpcpassword=rt' + ]] + ) + self.is_network_split = split + self.rpc = self.nodes[0] + self.sync_all() + print("Done setting up network") + + def send_and_mine(self, xtn, rpc_connection): + txid = rpc_connection.sendrawtransaction(xtn) + assert txid, 'got txid' + # we need the tx above to be confirmed in the next block + rpc_connection.generate(1) + return txid + + def run_test (self): + print("Mining blocks...") + rpc = self.nodes[0] + # utxos from block 1 become mature in block 101 + rpc.generate(101) + self.sync_all() + rpc.getinfo() + rpc.getwalletinfo() + + taddr = rpc.getnewaddress() + print "Sending to " + taddr + # sending to arbitrary non-notary transparent address is not allowed + assert_raises(JSONRPCException, rpc.sendtoaddress, taddr,1) + + # this is a current notary address + # TODO: keep in sync when notaries change + #dev1_jl777 = "RNJmgYaFF5DbnrNUX6pMYz9rcnDKC2tuAc" + # taddr vout is only allowed if it is a notary address + #txid = rpc.sendtoaddress(dev1_jl777, 7) + #assert txid, 'got txid' + +if __name__ == '__main__': + AssetChainPrivateTest ().main() diff --git a/src/main.cpp b/src/main.cpp index 607b94ba4..16568e673 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3820,6 +3820,11 @@ int32_t komodo_activate_sapling(CBlockIndex *pindex) height = pindex->GetHeight(); blocktime = (uint32_t)pindex->nTime; fprintf(stderr,"komodo_activate_sapling.%d starting blocktime %u cmp.%d\n",height,blocktime,blocktime > KOMODO_SAPLING_ACTIVATION); + + // avoid trying unless we have at least 30 blocks + if (height < 30) + return(0); + for (i=0; i<30; i++) { if ( (prev= pindex->pprev) == 0 )