[3.2] extra transaction data integration test

tests/CMakeLists.txt

@@ -39,6 +39,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_read_terminate_at_block_test.p
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_chainbase_allocation_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_chainbase_allocation_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_protocol_feature_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_protocol_feature_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_multiple_version_protocol_feature_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_multiple_version_protocol_feature_test.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nodeos_extra_packed_data_test.py ${CMAKE_CURRENT_BINARY_DIR}/nodeos_extra_packed_data_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/validate-dirty-db.py ${CMAKE_CURRENT_BINARY_DIR}/validate-dirty-db.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/launcher_test.py ${CMAKE_CURRENT_BINARY_DIR}/launcher_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/keosd_auto_launch_test.py ${CMAKE_CURRENT_BINARY_DIR}/keosd_auto_launch_test.py COPYONLY)
@@ -191,13 +192,8 @@ set_property(TEST nodeos_startup_catchup_lr_test PROPERTY LABELS long_running_te
 add_test(NAME nodeos_short_fork_take_over_lr_test COMMAND tests/nodeos_short_fork_take_over_test.py -v --wallet-port 9905 --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_short_fork_take_over_lr_test PROPERTY LABELS long_running_tests)
 
-if(ENABLE_MULTIVERSION_PROTOCOL_TEST)
-  set(ALTERNATE_VERSION_LABELS_FILE "${CMAKE_BINARY_DIR}/tests/multiversion_paths.conf")
-
-  add_test(NAME nodeos_multiple_version_protocol_feature_mv_test COMMAND tests/nodeos_multiple_version_protocol_feature_test.py
-           -v --clean-run --dump-error-detail --alternate-version-labels-file ${ALTERNATE_VERSION_LABELS_FILE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-  set_property(TEST nodeos_multiple_version_protocol_feature_mv_test PROPERTY LABELS mixed_version_tests)
-endif()
+add_test(NAME nodeos_extra_packed_data_test COMMAND tests/nodeos_extra_packed_data_test.py -v --clean-run -p 8 --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TEST nodeos_extra_packed_data_test PROPERTY LABELS long_running_tests)
 
 add_test(NAME nodeos_producer_watermark_lr_test COMMAND tests/nodeos_producer_watermark_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST nodeos_producer_watermark_lr_test PROPERTY LABELS long_running_tests)

tests/nodeos_extra_packed_data_test.py

@@ -0,0 +1,197 @@
+#!/usr/bin/env python3
+
+from testUtils import Account
+from testUtils import Utils
+from Cluster import Cluster, PFSetupPolicy
+from WalletMgr import WalletMgr
+from Node import Node
+from Node import ReturnType
+from TestHelper import TestHelper
+from TestHelper import AppArgs
+
+import decimal
+import re
+import json
+import os
+import copy
+import math
+import time
+
+###############################################################
+# nodeos_run_test
+#
+# General test that tests a wide range of general use actions around nodeos and keosd
+#
+###############################################################
+
+Print=Utils.Print
+errorExit=Utils.errorExit
+cmdError=Utils.cmdError
+from core_symbol import CORE_SYMBOL
+
+args = TestHelper.parse_args({"--host","--port","-p","--defproducera_prvt_key","--defproducerb_prvt_key"
+                              ,"--dump-error-details","--dont-launch","--keep-logs","-v","--leave-running","--clean-run"
+                              ,"--sanity-test","--wallet-port"})
+server=args.host
+port=args.port
+debug=args.v
+defproduceraPrvtKey=args.defproducera_prvt_key
+defproducerbPrvtKey=args.defproducerb_prvt_key
+dumpErrorDetails=args.dump_error_details
+keepLogs=args.keep_logs
+dontLaunch=args.dont_launch
+dontKill=args.leave_running
+pnodes=args.p
+killAll=args.clean_run
+sanityTest=args.sanity_test
+walletPort=args.wallet_port
+
+Utils.Debug=debug
+localTest=True if server == TestHelper.LOCAL_HOST else False
+cluster=Cluster(host=server, 
+                port=port, 
+                walletd=True,
+                defproduceraPrvtKey=defproduceraPrvtKey, 
+                defproducerbPrvtKey=defproducerbPrvtKey)
+walletMgr=WalletMgr(True, port=walletPort)
+testSuccessful=False
+killEosInstances=not dontKill
+killWallet=not dontKill
+dontBootstrap=sanityTest # intent is to limit the scope of the sanity test to just verifying that nodes can be started
+
+WalletdName=Utils.EosWalletName
+ClientName="cleos"
+timeout = .5 * 12 * 2 + 60 # time for finalization with 1 producer + 60 seconds padding
+Utils.setIrreversibleTimeout(timeout)
+
+try:
+    TestHelper.printSystemInfo("BEGIN")
+    cluster.setWalletMgr(walletMgr)
+    Print("SERVER: %s" % (server))
+    Print("PORT: %d" % (port))
+
+    if localTest and not dontLaunch:
+        cluster.killall(allInstances=killAll)
+        cluster.cleanup()
+        Print("Stand up cluster")
+        specificExtraNodeosArgs = {}
+        associatedNodeLabels = {}
+        if pnodes > 1:
+            specificExtraNodeosArgs[pnodes - 1] = ""
+        if pnodes > 3:
+            specificExtraNodeosArgs[pnodes - 2] = ""
+
+        traceNodeosArgs = " --plugin eosio::trace_api_plugin --trace-no-abis "
+        if cluster.launch(totalNodes=pnodes, 
+                          pnodes=pnodes,
+                          dontBootstrap=dontBootstrap,
+                          pfSetupPolicy=PFSetupPolicy.PREACTIVATE_FEATURE_ONLY,
+                          specificExtraNodeosArgs=specificExtraNodeosArgs,
+                          associatedNodeLabels=associatedNodeLabels,
+                          extraNodeosArgs=traceNodeosArgs,) is False:
+            cmdError("launcher")
+            errorExit("Failed to stand up eos cluster.")
+    else:
+        Print("Collecting cluster info.")
+        cluster.initializeNodes(defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
+        killEosInstances=False
+        Print("Stand up %s" % (WalletdName))
+        walletMgr.killall(allInstances=killAll)
+        walletMgr.cleanup()
+        print("Stand up walletd")
+        if walletMgr.launch() is False:
+            cmdError("%s" % (WalletdName))
+            errorExit("Failed to stand up eos walletd.")
+
+    if sanityTest:
+        testSuccessful=True
+        exit(0)
+
+    Print("Validating system accounts after bootstrap")
+    cluster.validateAccounts(None)
+
+    accounts=Cluster.createAccountKeys(2)
+    if accounts is None:
+        errorExit("FAILURE - create keys")
+    testeraAccount=accounts[0]
+    testeraAccount.name="testerxxxxxa"
+    testerbAccount=accounts[1]
+    testerbAccount.name="testerxxxxxb"
+
+    testWalletName="test"
+    Print("Creating wallet \"%s\"" % (testWalletName))
+    walletAccounts=copy.deepcopy(cluster.defProducerAccounts)
+    if dontLaunch:
+        del walletAccounts["eosio"]
+    testWallet = walletMgr.create(testWalletName, walletAccounts.values())
+
+    Print("Wallet \"%s\" password=%s." % (testWalletName, testWallet.password.encode("utf-8")))
+
+    all_acc = accounts + list( cluster.defProducerAccounts.values() )
+    for account in all_acc:
+        Print("Importing keys for account %s into wallet %s." % (account.name, testWallet.name))
+        if not walletMgr.importKey(account, testWallet):
+            cmdError("%s wallet import" % (ClientName))
+            errorExit("Failed to import key for account %s" % (account.name))
+
+    node=cluster.getNode(0)
+
+    Print("Create new account %s via %s" % (testeraAccount.name, cluster.defproduceraAccount.name))
+    transId=node.createInitializeAccount(testeraAccount, cluster.defproduceraAccount, stakedDeposit=0, waitForTransBlock=False, exitOnError=True)
+
+    Print("Create new account %s via %s" % (testerbAccount.name, cluster.defproduceraAccount.name))
+    transId=node.createInitializeAccount(testerbAccount, cluster.defproduceraAccount, stakedDeposit=0, waitForTransBlock=False, exitOnError=True)
+
+    Print("Validating accounts after user accounts creation")
+    accounts=[testeraAccount, testerbAccount]
+    cluster.validateAccounts(accounts)
+
+    trxNumber = 2
+    postedTrxs = []
+    for i in range(trxNumber):
+        if i == 1:
+            node = cluster.getNode(pnodes - 1)
+
+        transferAmount="{0}.0 {1}".format(i + 1, CORE_SYMBOL)
+        Print("Transfer funds %s from account %s to %s" % (transferAmount, cluster.defproduceraAccount.name, testeraAccount.name))
+        trx = node.transferFunds(cluster.defproduceraAccount, testeraAccount, transferAmount, "test transfer", dontSend=True)
+
+        cmdDesc = "convert pack_transaction"
+        cmd     = "%s --pack-action-data '%s'" % (cmdDesc, json.dumps(trx))
+        exitMsg = "failed to pack transaction: %s" % (trx)
+        packedTrx = node.processCleosCmd(cmd, cmdDesc, silentErrors=False, exitOnError=True, exitMsg=exitMsg)
+
+        packed_trx_param = packedTrx["packed_trx"]
+        if packed_trx_param is None:
+            cmdError("packed_trx is None. Json: %s" % (packedTrx))
+            errorExit("Can't find packed_trx in packed json")
+
+        #adding random trailing data
+        packedTrx["packed_trx"] = packed_trx_param + "00000000"
+
+        exitMsg = "failed to send packed transaction: %s" % (packedTrx)
+        sentTrx = node.processCurlCmd("chain", "send_transaction", json.dumps(packedTrx), silentErrors=False, exitOnError=True, exitMsg=exitMsg)
+        Print("sent transaction json: %s" % (sentTrx))
+        trx_id = sentTrx["transaction_id"]
+        postedTrxs.append(trx_id)
+
+    assert len(postedTrxs) == trxNumber, Print("posted transactions number %d doesn't match %d" % (len(postedTrxs), trxNumber))
+
+    for trxId in postedTrxs:        
+        attemptCnt = 10
+        trxBlock = None
+        while trxBlock is None and attemptCnt > 0:
+            trxBlock = node.getBlockNumByTransId(trx_id)
+            attemptCnt = attemptCnt - 1
+
+        assert trxBlock, Print("Transaction %s wasn't posted" % (trx_id))
+
+        for cur_node in cluster.getNodes():
+
+            timeout = (12 * pnodes) * 1.3
+            passed = cur_node.waitForBlock(trxBlock + 12 * pnodes, timeout)
+            assert passed, Print("Node %d not advanced head block within timeout")
+
+    testSuccessful=True
+finally:
+    TestHelper.shutdown(cluster, walletMgr, testSuccessful, killEosInstances, killWallet, keepLogs, killAll, dumpErrorDetails)